Added BG Analysis and required qhere analysisRequired is calculated and how. Fixed more minor issues that where reported for efas

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

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -1,14 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import java.time.OffsetDateTime;
-
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -1,14 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -1,16 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.*;
+
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -12,7 +12,6 @@ import lombok.NoArgsConstructor;
 public class Rectangle {
 
 
-
     private float topLeftX;
 
     private float topLeftY;

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

@@ -1,11 +1,11 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AddNotificationRequest.java

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditModel.java

@@ -1,14 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditRequest.java

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditSearchRequest.java

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
-import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/common/Page.java

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.common;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @AllArgsConstructor
 @NoArgsConstructor
 @Data

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java

@@ -1,14 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Set;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+import java.util.HashSet;
+import java.util.Set;
+
 
 @Data
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierAttributeConfig.java

@@ -1,7 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttributeType;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierTemplate.java

@@ -1,16 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Set;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+import java.util.HashSet;
+import java.util.Set;
+
 
 @Data
 @Builder

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ImportCsvResponse.java

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplate.java

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
-import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplateUploadRequest.java

@@ -1,11 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
+import lombok.*;
 
 @Data
 @Builder

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/DigitalSignatureUpdateModel.java

@@ -1,10 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
 
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Data
 @NoArgsConstructor(access = AccessLevel.PRIVATE)

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/CreateOrUpdateDossierRequest.java

@@ -1,18 +1,17 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DeletedDossier.java

@@ -1,10 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
-import java.time.OffsetDateTime;
-
 import lombok.Builder;
 import lombok.Data;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 public class DeletedDossier {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/Dossier.java

@@ -1,17 +1,16 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Set;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+import java.util.HashSet;
+import java.util.Set;
+
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/BinaryFileRequest.java

@@ -1,11 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
+import lombok.*;
 
 @Data
 @Builder

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/BinaryFileResult.java

@@ -1,11 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
+import lombok.*;
 
 @Data
 @Builder

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java

@@ -1,18 +1,17 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 @Data
 @Builder
 @AllArgsConstructor
@@ -39,6 +38,7 @@ public class FileModel {
     private boolean hasSuggestions;
     private boolean hasImages;
     private boolean hasUpdates;
+    private boolean analysisRequired;
     private String uploader;
     private long dictionaryVersion;
     private long rulesVersion;
@@ -56,6 +56,7 @@ public class FileModel {
     private Set<Integer> excludedPages = new HashSet<>();
     private Map<String, String> fileAttributes = new HashMap<>();
     private String dossierId;
+    private String dossierTemplateId;
 
 
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/legalbasis/LegalBasisMapping.java

@@ -1,11 +1,11 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @NoArgsConstructor
 public class LegalBasisMapping {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/DictionaryEntry.java

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type;
 
-import java.io.Serializable;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadRequest.java

@@ -1,14 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.model.download;
 
+import lombok.*;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadStatus.java

@@ -1,16 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.model.download;
 
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/SetDownloadedRequest.java

@@ -1,10 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.model.download;
 
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Data
 @Builder

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReport.java

@@ -1,14 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.license;
 
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java

@@ -1,17 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.license;
 
+import lombok.*;
+
 import java.time.Instant;
 import java.time.Year;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/ReportData.java

@@ -1,14 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.license;
 
-import java.time.Instant;
-
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileStatus;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.Instant;
+
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/Notification.java

@@ -1,14 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.notification;
 
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/AuditResource.java

@@ -1,20 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import com.iqser.red.service.persistence.service.v1.api.model.audit.AuditModel;
 import com.iqser.red.service.persistence.service.v1.api.model.audit.AuditRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.audit.AuditSearchRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.audit.CategoryModel;
 import com.iqser.red.service.persistence.service.v1.api.model.common.Page;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 public interface AuditResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DictionaryResource.java

@@ -1,21 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @ResponseStatus(value = HttpStatus.OK)
 public interface DictionaryResource {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DigitalSignatureResource.java

@@ -1,15 +1,9 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.DigitalSignature;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.DigitalSignature;
+import org.springframework.web.bind.annotation.*;
 
 @ResponseStatus(value = HttpStatus.OK)
 public interface DigitalSignatureResource {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesConfigResource.java

@@ -1,19 +1,11 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierAttributeConfig;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierAttributeConfig;
+import java.util.List;
 
 public interface DossierAttributesConfigResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesResource.java

@@ -1,15 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttribute;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 public interface DossierAttributesResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierTemplateResource.java

@@ -1,20 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.CreateOrUpdateDossierTemplateRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 public interface DossierTemplateResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DownloadResource.java

@@ -1,18 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
 import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatus;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @ResponseStatus(value = HttpStatus.OK)
 public interface DownloadResource {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesConfigResource.java

@@ -1,20 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.FileAttributesGeneralConfiguration;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileAttributeConfig;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 public interface FileAttributesConfigResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesResource.java

@@ -1,14 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.Map;
-
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvRequest;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvResponse;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvResponse;
+import java.util.Map;
 
 public interface FileAttributesResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileStatusProcessingUpdateResource.java

@@ -1,5 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -7,8 +8,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-
 
 public interface FileStatusProcessingUpdateResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LegalBasisMappingResource.java

@@ -1,17 +1,11 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
+import java.util.List;
 
 public interface LegalBasisMappingResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LicenseReportResource.java

@@ -1,15 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import com.iqser.red.service.persistence.service.v1.api.model.license.LicenseReport;
 import com.iqser.red.service.persistence.service.v1.api.model.license.LicenseReportRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
 
 public interface LicenseReportResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ManualRedactionResource.java

@@ -1,30 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
+import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AddRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.CommentRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ForceRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImageRecategorizationRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.LegalBasisChangeRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualAddResponse;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualForceRedaction;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualImageRecategorization;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualLegalBasisChange;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.RemoveRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
+import org.springframework.web.bind.annotation.*;
 
 @ResponseStatus(value = HttpStatus.OK)
 public interface ManualRedactionResource {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/NotificationResource.java

@@ -1,20 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import com.iqser.red.service.persistence.service.v1.api.model.audit.AddNotificationRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.notification.Notification;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @ResponseStatus(value = HttpStatus.OK)
 public interface NotificationResource {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java

@@ -1,13 +1,9 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.Set;
-
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Set;
 
 @ResponseStatus(value = HttpStatus.NO_CONTENT)
 public interface ReanalysisResource {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java

@@ -1,5 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -7,9 +9,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
-
 @ResponseStatus(value = HttpStatus.OK)
 public interface RedactionLogResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReportTemplateResource.java

@@ -1,17 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplate;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateDownload;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateUploadRequest;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 public interface ReportTemplateResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RulesResource.java

@@ -1,15 +1,9 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
+import org.springframework.web.bind.annotation.*;
 
 public interface RulesResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/SMTPConfigurationResource.java

@@ -1,16 +1,9 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.SMTPConfiguration;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.SMTPConfiguration;
+import org.springframework.web.bind.annotation.*;
 
 
 public interface SMTPConfigurationResource {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java

@@ -1,20 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Set;
 
 public interface StatusResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/UploadResource.java

@@ -1,18 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.Set;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.BinaryFileRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.BinaryFileResult;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Set;
 
 @ResponseStatus(value = HttpStatus.OK)
 public interface UploadResource {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/UserPreferenceResource.java

@@ -1,16 +1,9 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.fasterxml.jackson.databind.JsonNode;
+import org.springframework.web.bind.annotation.*;
 
 public interface UserPreferenceResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ViewedPagesResource.java

@@ -1,17 +1,11 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.List;
-
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ViewedPage;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ViewedPage;
+import java.util.List;
 
 @ResponseStatus(value = HttpStatus.OK)
 public interface ViewedPagesResource {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/WatermarkResource.java

@@ -1,15 +1,9 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Watermark;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Watermark;
+import org.springframework.web.bind.annotation.*;
 
 @ResponseStatus(value = HttpStatus.OK)
 public interface WatermarkResource {

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

@@ -116,5 +116,13 @@ public class DictionaryPersistenceService {
         typeRepository.updateByIdSetIncrementVersionByOne(typeId);
     }
 
+    public long getVersion(String dossierTemplateId) {
+        return getAllTypesForDossierTemplate(dossierTemplateId).stream().map(TypeEntity::getVersion).reduce(0L, Long::sum);
+    }
+
+    public long getVersionForDossier(String dossierId) {
+        return getAllTypesForDossier(dossierId).stream().map(TypeEntity::getVersion).reduce(0L, Long::sum);
+    }
+
 
 }

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

@@ -0,0 +1,51 @@
+package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.LegalBasisEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.LegalBasisMappingEntity;
+import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.LegalBasisMappingRepository;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
+
+
+@Service
+@RequiredArgsConstructor
+public class LegalBasisMappingPersistenceService {
+
+
+    private final LegalBasisMappingRepository legalBasisMappingRepository;
+
+
+    @Transactional
+    public void setLegalBasisMapping(String dossierTemplateId, List<LegalBasis> legalBasisMapping) {
+
+        legalBasisMappingRepository.findById(dossierTemplateId).ifPresentOrElse((lbm) -> {
+            lbm.setVersion(lbm.getVersion() + 1);
+            lbm.setLegalBasis(convert(legalBasisMapping, LegalBasisEntity.class));
+            legalBasisMappingRepository.save(lbm);
+        }, () -> {
+            var lbm = new LegalBasisMappingEntity();
+            lbm.setDossierTemplateId(dossierTemplateId);
+            lbm.setLegalBasis(convert(legalBasisMapping, LegalBasisEntity.class));
+            lbm.setVersion(1);
+            legalBasisMappingRepository.save(lbm);
+        });
+
+    }
+
+
+    public List<LegalBasisEntity> getLegalBasisMapping(String dossierTemplateId) {
+        return legalBasisMappingRepository.findById(dossierTemplateId).map(LegalBasisMappingEntity::getLegalBasis)
+                .orElseThrow(() -> new NotFoundException("Legal Basis Not configured!"));
+    }
+
+    public long getVersion(String dossierTemplateId) {
+        return legalBasisMappingRepository.findById(dossierTemplateId).map(LegalBasisMappingEntity::getVersion).orElse(0L);
+    }
+}

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

@@ -20,9 +20,11 @@ import org.springframework.retry.backoff.ExponentialBackOffPolicy;
 import org.springframework.retry.policy.SimpleRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableAsync
 @EnableRetry
+@EnableScheduling
 @EnableConfigurationProperties(FileManagementServiceSettings.class)
 @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class, CassandraAutoConfiguration.class})
 @Import({DefaultWebMvcConfiguration.class, PersistenceServiceProcessorConfiguration.class, MessagingConfiguration.class, CleanupDownloadSchedulerConfiguration.class})

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

@@ -259,12 +259,12 @@ public class DictionaryController implements DictionaryResource {
 
     @Override
     public long getVersion(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId) {
-        return getAllTypesForDossierTemplate(dossierTemplateId).stream().map(Type::getVersion).reduce(0L, Long::sum);
+        return dictionaryPersistenceService.getVersion(dossierTemplateId);
     }
 
     @Override
     public long getVersionForDossier(@PathVariable(DOSSIER_ID_PARAMETER_NAME) String dossierId) {
-        return getAllTypesForDossier(dossierId).stream().map(Type::getVersion).reduce(0L, Long::sum);
+        return dictionaryPersistenceService.getVersionForDossier(dossierId);
     }
 
 

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

@@ -1,9 +1,6 @@
 package com.iqser.red.service.peristence.v1.server.controller;
 
-import com.iqser.red.service.peristence.v1.server.service.AnalysisFlagsCalculationService;
-import com.iqser.red.service.peristence.v1.server.service.DossierService;
-import com.iqser.red.service.peristence.v1.server.service.ExcludeFromAnalysisService;
-import com.iqser.red.service.peristence.v1.server.service.FileStatusService;
+import com.iqser.red.service.peristence.v1.server.service.*;
 import com.iqser.red.service.peristence.v1.server.utils.FileModelMapper;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
 import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
@@ -30,33 +27,34 @@ public class FileStatusController implements StatusResource {
     private final DossierService dossierService;
     private final ExcludeFromAnalysisService excludeFromAnalysis;
     private final AnalysisFlagsCalculationService analysisFlagsCalculationService;
+    private final ReanalysisRequiredStatusService reanalysisRequiredStatusService;
 
     @Override
     public List<FileModel> getAllStatuses() {
 
-        return convert(fileStatusService.getAllStatuses()
+        return reanalysisRequiredStatusService.enhanceFileStatusWithAnalysisRequirements(convert(fileStatusService.getAllStatuses()
                 .stream()
                 .filter(f -> !f.getStatus().equals(FileStatus.DELETED))
-                .collect(Collectors.toList()), FileModel.class, new FileModelMapper());
+                .collect(Collectors.toList()), FileModel.class, new FileModelMapper()));
     }
 
 
     @Override
     public List<FileModel> getDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId) {
 
-        return convert(fileStatusService.getDossierStatus(dossierId)
+        return reanalysisRequiredStatusService.enhanceFileStatusWithAnalysisRequirements(convert(fileStatusService.getDossierStatus(dossierId)
                 .stream()
                 .filter(f -> !f.getStatus().equals(FileStatus.DELETED))
-                .collect(Collectors.toList()), FileModel.class, new FileModelMapper());
+                .collect(Collectors.toList()), FileModel.class, new FileModelMapper()));
     }
 
     @Override
     public List<FileModel> getSoftDeletedDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId) {
 
-        return convert(fileStatusService.getDossierStatus(dossierId)
+        return reanalysisRequiredStatusService.enhanceFileStatusWithAnalysisRequirements(convert(fileStatusService.getDossierStatus(dossierId)
                 .stream()
                 .filter(f -> f.getStatus().equals(FileStatus.DELETED) && f.getHardDeletedTime() == null)
-                .collect(Collectors.toList()), FileModel.class, new FileModelMapper());
+                .collect(Collectors.toList()), FileModel.class, new FileModelMapper()));
     }
 
 
@@ -64,7 +62,8 @@ public class FileStatusController implements StatusResource {
     public FileModel getFileStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
                                    @PathVariable(FILE_ID) String fileId) {
 
-        return convert(fileStatusService.getStatus(fileId), FileModel.class, new FileModelMapper());
+        return reanalysisRequiredStatusService.enhanceFileStatusWithAnalysisRequirements(
+                convert(fileStatusService.getStatus(fileId), FileModel.class, new FileModelMapper()));
     }
 
 

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

@@ -1,9 +1,6 @@
 package com.iqser.red.service.peristence.v1.server.controller;
 
-import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.LegalBasisEntity;
-import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.LegalBasisMappingEntity;
-import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.LegalBasisMappingRepository;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.LegalBasisMappingPersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
 import com.iqser.red.service.persistence.service.v1.api.resources.LegalBasisMappingResource;
 import lombok.RequiredArgsConstructor;
@@ -22,37 +19,25 @@ import static com.iqser.red.service.persistence.management.v1.processor.utils.Ma
 public class LegalBasisMappingController implements LegalBasisMappingResource {
 
 
-    private final LegalBasisMappingRepository legalBasisMappingRepository;
+    private final LegalBasisMappingPersistenceService legalBasisMappingPersistenceService;
 
 
     @Override
     @Transactional
     public void setLegalBasisMapping(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @RequestBody List<LegalBasis> legalBasisMapping) {
 
-        legalBasisMappingRepository.findById(dossierTemplateId).ifPresentOrElse((lbm) -> {
-            lbm.setVersion(lbm.getVersion() + 1);
-            lbm.setLegalBasis(convert(legalBasisMapping, LegalBasisEntity.class));
-            legalBasisMappingRepository.save(lbm);
-        }, () -> {
-            var lbm = new LegalBasisMappingEntity();
-            lbm.setDossierTemplateId(dossierTemplateId);
-            lbm.setLegalBasis(convert(legalBasisMapping, LegalBasisEntity.class));
-            lbm.setVersion(1);
-            legalBasisMappingRepository.save(lbm);
-        });
+        legalBasisMappingPersistenceService.setLegalBasisMapping(dossierTemplateId, legalBasisMapping);
 
     }
 
     @Override
     @Transactional
     public List<LegalBasis> getLegalBasisMapping(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId) {
-        return convert(
-                legalBasisMappingRepository.findById(dossierTemplateId).map(LegalBasisMappingEntity::getLegalBasis)
-                        .orElseThrow(() -> new NotFoundException("Legal Basis Not configured!")), LegalBasis.class);
+        return convert(legalBasisMappingPersistenceService.getLegalBasisMapping(dossierTemplateId), LegalBasis.class);
     }
 
     @Override
     public long getVersion(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId) {
-        return legalBasisMappingRepository.findById(dossierTemplateId).map(LegalBasisMappingEntity::getVersion).orElse(0L);
+        return legalBasisMappingPersistenceService.getVersion(dossierTemplateId);
     }
 }

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

@@ -3,10 +3,13 @@ package com.iqser.red.service.peristence.v1.server.controller;
 import com.google.common.collect.Sets;
 import com.iqser.red.service.peristence.v1.server.service.FileStatusService;
 import com.iqser.red.service.peristence.v1.server.service.IndexingService;
+import com.iqser.red.service.peristence.v1.server.service.ReanalysisRequiredStatusService;
+import com.iqser.red.service.peristence.v1.server.utils.FileModelMapper;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService;
+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.FileStatus;
 import com.iqser.red.service.persistence.service.v1.api.resources.ReanalysisResource;
 import lombok.RequiredArgsConstructor;
@@ -22,6 +25,8 @@ 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
 @RestController
 @RequiredArgsConstructor
@@ -32,6 +37,7 @@ public class ReanalysisController implements ReanalysisResource {
     private final DictionaryController dictionaryClient;
     private final RulesController rulesClient;
     private final IndexingService indexingService;
+    private final ReanalysisRequiredStatusService reanalysisRequiredStatusService;
 
 
     @Override
@@ -146,18 +152,19 @@ public class ReanalysisController implements ReanalysisResource {
 
     private void reanalyseFiles(String dossierId, boolean force, List<FileEntity> filesToReanalyse) {
 
-        var dossier = dossierPersistenceService.getAndValidateDossier(dossierId);
-        // TODO
-        var dictionaryVersion = dictionaryClient.getVersion(dossier.getDossierTemplateId());
-        var dossierDictionaryVersion = dictionaryClient.getVersionForDossier(dossierId);
-        var rulesVersion = rulesClient.getVersion(dossier.getDossierTemplateId());
+        if (force) {
+            filesToReanalyse.forEach(file -> {
+                fileStatusService.setStatusReprocess(dossierId, file.getId(), 1);
+            });
+        } else {
+            var enhancedAndConvertedFiles = reanalysisRequiredStatusService.enhanceFileStatusWithAnalysisRequirements(convert(
+                    fileStatusService.getAllStatuses(), FileModel.class, new FileModelMapper()));
+
+            enhancedAndConvertedFiles.forEach(file -> {
+                fileStatusService.setStatusReprocess(dossierId, file.getId(), 1);
+            });
+        }
 
-        filesToReanalyse.forEach(fileStatus -> {
-            if (fileStatus.getStatus().equals(FileStatus.ERROR) || !allManualRedactionsApplied(fileStatus) || !allFileAttributesChangesApplied(fileStatus)
-                    || fileStatus.getRulesVersion() < rulesVersion || fileStatus.getDictionaryVersion() < dictionaryVersion || fileStatus.getDossierDictionaryVersion() < dossierDictionaryVersion || force) {
-                fileStatusService.setStatusReprocess(dossierId, fileStatus.getId(), 1);
-            }
-        });
     }
 
 

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

@@ -0,0 +1,112 @@
+package com.iqser.red.service.peristence.v1.server.service;
+
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DictionaryPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.LegalBasisMappingPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.RulesPersistenceService;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.iqser.red.service.peristence.v1.server.service.ReanalysisRequiredStatusService.VersionType.*;
+
+@Service
+@RequiredArgsConstructor
+public class ReanalysisRequiredStatusService {
+
+    private final DictionaryPersistenceService dictionaryPersistenceService;
+    private final RulesPersistenceService rulesPersistenceService;
+    private final DossierPersistenceService dossierPersistenceService;
+    private final LegalBasisMappingPersistenceService legalBasisMappingPersistenceService;
+
+
+    public FileModel enhanceFileStatusWithAnalysisRequirements(FileModel fileModel) {
+        return enhanceFileStatusWithAnalysisRequirements(Collections.singletonList(fileModel)).iterator().next();
+    }
+
+    public List<FileModel> enhanceFileStatusWithAnalysisRequirements(List<FileModel> fileModels) {
+
+        Map<String, Map<VersionType, Long>> dossierTemplateVersionMap = new HashMap<>();
+        Map<String, Long> dossierVersionMap = new HashMap<>();
+        Map<String, DossierEntity> dossierMap = new HashMap<>();
+        fileModels.forEach(entry -> entry.setAnalysisRequired(computeAnalysisRequired(entry, dossierTemplateVersionMap, dossierVersionMap, dossierMap)));
+
+        return fileModels;
+    }
+
+    private boolean computeAnalysisRequired(FileModel fileStatus,
+                                            Map<String, Map<VersionType, Long>> dossierTemplateVersionMap,
+                                            Map<String, Long> dossierVersionMap,
+                                            Map<String, DossierEntity> dossierMap) {
+        switch (fileStatus.getStatus()) {
+            case ERROR:
+                return true;
+            case UNASSIGNED:
+            case UNDER_REVIEW:
+            case UNDER_APPROVAL:
+                if (fileStatus.getLastProcessed() == null) {
+                    return true;
+                }
+                if (fileStatus.getLastFileAttributeChange() != null && fileStatus.getLastProcessed().isBefore(fileStatus.getLastFileAttributeChange())) {
+                    return true;
+                } else {
+                    return requiresReanalysisBasedOnVersionDifference(fileStatus, dossierTemplateVersionMap, dossierVersionMap, dossierMap);
+                }
+            default:
+                return false;
+        }
+
+    }
+
+    private boolean requiresReanalysisBasedOnVersionDifference(FileModel fileStatus,
+                                                               Map<String, Map<VersionType, Long>> dossierTemplateVersionMap,
+                                                               Map<String, Long> dossierVersionMap,
+                                                               Map<String, DossierEntity> dossierMap) {
+
+        // enhance with dossierTemplateId
+        DossierEntity dossier = dossierMap.computeIfAbsent(fileStatus.getDossierId(), k -> dossierPersistenceService.getAndValidateDossier(fileStatus.getDossierId()));
+        fileStatus.setDossierTemplateId(dossier.getDossierTemplateId());
+
+        // get relevant versions
+        var dossierTemplateVersions = dossierTemplateVersionMap.computeIfAbsent(fileStatus.getDossierTemplateId(),
+                k -> buildVersionData(fileStatus.getDossierTemplateId()));
+        var dossierDictionaryVersion = dossierVersionMap.computeIfAbsent(fileStatus.getDossierId(),
+                k -> getDossierVersionData(fileStatus.getDossierId()));
+
+        // compute matches
+        var rulesVersionMatches = fileStatus.getRulesVersion() == dossierTemplateVersions.getOrDefault(RULES, -1L);
+        var dictionaryVersionMatches = fileStatus.getDictionaryVersion() == dossierTemplateVersions.getOrDefault(DICTIONARY, -1L);
+        var legalBasisVersionMatches = fileStatus.getLegalBasisVersion() == dossierTemplateVersions.getOrDefault(LEGAL_BASIS, -1L);
+        var dossierDictionaryVersionMatches = fileStatus.getDossierDictionaryVersion() == dossierDictionaryVersion;
+
+        return !(rulesVersionMatches && dictionaryVersionMatches && legalBasisVersionMatches && dossierDictionaryVersionMatches);
+
+    }
+
+    private Long getDossierVersionData(String dossierId) {
+        return dictionaryPersistenceService.getVersionForDossier(dossierId);
+    }
+
+    private Map<VersionType, Long> buildVersionData(String dossierTemplateId) {
+
+        var versions = new HashMap<VersionType, Long>();
+
+        versions.put(RULES, rulesPersistenceService.getRules(dossierTemplateId).getVersion());
+        versions.put(DICTIONARY, dictionaryPersistenceService.getVersion(dossierTemplateId));
+        versions.put(LEGAL_BASIS, legalBasisMappingPersistenceService.getVersion(dossierTemplateId));
+
+
+        return versions;
+    }
+
+    public enum VersionType {
+        RULES, DICTIONARY, LEGAL_BASIS
+    }
+
+}

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

@@ -0,0 +1,80 @@
+package com.iqser.red.service.peristence.v1.server.service.scheduler;
+
+import com.iqser.red.service.peristence.v1.server.configuration.MessagingConfiguration;
+import com.iqser.red.service.peristence.v1.server.service.FileStatusService;
+import com.iqser.red.service.peristence.v1.server.service.ReanalysisRequiredStatusService;
+import com.iqser.red.service.peristence.v1.server.utils.FileModelMapper;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
+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.FileStatus;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.AmqpAdmin;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AutomaticAnalysisScheduler {
+
+
+    private final FileStatusService fileStatusService;
+    private final ReanalysisRequiredStatusService reanalysisRequiredStatusService;
+    private final AmqpAdmin amqpAdmin;
+
+
+    @Scheduled(fixedDelay = 10000, initialDelay = 10000)
+    public void checkFilesThatRequireReanalysisAndQueueIfPossible() {
+
+        var redactionQueueInfo = amqpAdmin.getQueueInfo(MessagingConfiguration.REDACTION_QUEUE);
+        if (redactionQueueInfo != null) {
+            log.info("Checking queue status to see if background analysis can happen. Currently {} holds {} elements and has {} consumers",
+                    MessagingConfiguration.REDACTION_QUEUE,
+                    redactionQueueInfo.getMessageCount(),
+                    redactionQueueInfo.getConsumerCount());
+            // only 1 file in queue
+            if (redactionQueueInfo.getMessageCount() <= 1) {
+                // queue up 5 files
+                var allStatuses = getAllStatuses().iterator();
+                int queuedCount = 0;
+
+                while (queuedCount < 5 && allStatuses.hasNext()) {
+                    var next = allStatuses.next();
+                    if (next.isAnalysisRequired()) {
+                        queuedCount += 1;
+                        log.info("Queued file: {} for automatic analysis!", next.getFilename());
+                        fileStatusService.setStatusReprocess(next.getDossierId(), next.getId(), 1);
+                    }
+                }
+            }
+
+        } else {
+            log.info("Failed to obtain queue info for queue: {}", MessagingConfiguration.REDACTION_QUEUE);
+        }
+    }
+
+
+    private List<FileModel> getAllStatuses() {
+
+        return reanalysisRequiredStatusService.enhanceFileStatusWithAnalysisRequirements(convert(fileStatusService.getAllStatuses()
+                .stream()
+                .filter(f -> !f.getStatus().equals(FileStatus.DELETED))
+                .filter(f -> !f.getStatus().equals(FileStatus.APPROVED))
+                .filter(f -> !isProcessing(f))
+                .collect(Collectors.toList()), FileModel.class, new FileModelMapper()));
+    }
+
+    private boolean isProcessing(FileEntity file) {
+        return file.getStatus() == FileStatus.PROCESSING ||
+                file.getStatus() == FileStatus.REPROCESS ||
+                file.getStatus() == FileStatus.FULLREPROCESS ||
+                file.getStatus() == FileStatus.INDEXING ||
+                file.getStatus() == FileStatus.OCR_PROCESSING;
+    }
+}

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java

@@ -18,6 +18,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
+import org.springframework.amqp.core.AmqpAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -44,6 +45,8 @@ import java.util.TimeZone;
 @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 public abstract class AbstractPersistenceServerServiceTest {
 
+    @MockBean
+    private AmqpAdmin amqpAdmin;
     @MockBean
     protected RabbitTemplate rabbitTemplate;
     @MockBean
@@ -108,6 +111,7 @@ public abstract class AbstractPersistenceServerServiceTest {
 
         doNothing().when(pdfTronRedactionClient).testDigitalCurrentSignature(Mockito.any());
 
+        when(amqpAdmin.getQueueInfo(Mockito.any())).thenReturn(null);
         when(pdfTronRedactionClient.optimize(Mockito.any())).thenAnswer((args) ->
                 new PdfTronOptimizeResponse(((PdfTronOptimizeRequest) args.getArguments()[0]).getDocument()));
         when(pdfTronRedactionClient.redact(Mockito.any())).thenAnswer((args) ->