pojo classes wip

.dev/docker-compose.yaml

@@ -24,6 +24,6 @@ services:
   minio:
     mem_limit: 1000m
     image: minio/minio
-    command: server /data
+    command: server /entity
     ports:
       - 9000:9000

persistence-service-v1/persistence-service-api-v1/pom.xml

@@ -50,18 +50,7 @@
             <groupId>com.iqser.red.commons</groupId>
             <artifactId>jackson-commons</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>5.4.28.Final</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-            <version>2.4.5</version>
-            <scope>compile</scope>
-        </dependency>
+
     </dependencies>
 
 </project>

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

@@ -1,7 +1,5 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.Rectangle;
 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/annotations/AnnotationStatus.java

@@ -0,0 +1,8 @@
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
+
+public enum AnnotationStatus {
+    REQUESTED,
+    APPROVED,
+    DECLINED
+
+}

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

@@ -0,0 +1,25 @@
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
+
+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
+@NoArgsConstructor
+public class Comment {
+
+    private long id;
+    private String fileId;
+    private String annotationId;
+    private OffsetDateTime date;
+    private String text;
+    private String user;
+    private OffsetDateTime softDeletedTime;
+    private FileModel fileStatus;
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -1,6 +1,5 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationStatus;
 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/annotations/IdRemoval.java

@@ -0,0 +1,25 @@
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.OffsetDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class IdRemoval {
+
+    private String annotationId;
+    private String fileId;
+    private String user;
+    private AnnotationStatus status;
+    private boolean removeFromDictionary;
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}

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

@@ -1,6 +1,5 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationStatus;
 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/annotations/LegalBasisChangeRequest.java

@@ -1,6 +1,5 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationStatus;
 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/annotations/ManualAddResponse.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -0,0 +1,29 @@
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.OffsetDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "manual_force_redaction")
+public class ManualForceRedaction {
+
+    private String annotationId;
+    private String fileId;
+    private String user;
+    private AnnotationStatus status;
+    private String legalBasis;
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}

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

@@ -0,0 +1,28 @@
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.OffsetDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "manual_image_recategorization")
+public class ManualImageRecategorization {
+
+    private String annotationId;
+    private String fileId;
+    private String user;
+    private AnnotationStatus status;
+    private String type;
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+}

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

@@ -0,0 +1,29 @@
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.OffsetDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "manual_legal_basis_change")
+public class ManualLegalBasisChange {
+
+    private String annotationId;
+    private String fileId;
+    private String user;
+    private AnnotationStatus status;
+    private String legalBasis;
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}

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

@@ -0,0 +1,37 @@
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@Entity
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name = "manual_redaction")
+public class ManualRedactionEntry {
+
+    private String annotationId;
+    private String fileId;
+    private String user;
+    private String typeId;
+    private String value;
+    private String reason;
+    private String legalBasis;
+    private AnnotationStatus status;
+    private boolean addToDictionary;
+    private boolean addToDossierDictionary;
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+    private List<Rectangle> positions = new ArrayList<>();
+
+}

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

@@ -1,6 +1,5 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.*;
 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/annotations/Rectangle.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.annotations;
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -19,15 +19,15 @@ public class Rectangle {
     @GeneratedValue
     private long id;
 
-    @Column
+
     private float topLeftX;
-    @Column
+
     private float topLeftY;
-    @Column
+
     private float width;
-    @Column
+
     private float height;
-    @Column
+
     private int page;
 
     @ManyToOne(fetch = FetchType.LAZY)

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

@@ -1,6 +1,5 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationStatus;
 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/annotations/ViewedPage.java

@@ -0,0 +1,19 @@
+package com.iqser.red.service.persistence.service.v1.api.model.annotations;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.OffsetDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ViewedPage {
+
+    private String fileId;
+    private int page;
+    private String userId;
+    private OffsetDateTime viewedTime;
+
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.audit;
+package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -0,0 +1,30 @@
+package com.iqser.red.service.persistence.service.v1.api.model.audit;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "audit")
+public class AuditModel {
+
+    private long recordId;
+    private OffsetDateTime recordDate;
+    private String objectId;
+    private String category;
+    private String userId;
+    private String message;
+    private Map<String, Object> details = new HashMap<>();
+
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.audit;
+package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.audit;
+package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.audit;
+package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.common;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -0,0 +1,22 @@
+package com.iqser.red.service.persistence.service.v1.api.model.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Builder
+public class Page<T> {
+
+    @Builder.Default
+    private List<T> elements = new ArrayList<>();
+    private long totalHits;
+    private int page;
+    private int pageSize;
+}

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

@@ -1,8 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.annotations;
-
-public enum AnnotationStatus {
-    REQUESTED,
-    APPROVED,
-    DECLINED
-
-}

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

@@ -1,2 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.download;
-

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

@@ -1,6 +1,5 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DownloadFileType;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -8,9 +7,7 @@ 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;
 
 

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

@@ -0,0 +1,27 @@
+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;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Id;
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DossierAttributeConfig {
+
+    @Id
+    private String id;
+    private String label;
+    private boolean editable;
+    private String placeholder;
+    private DossierAttributeType type = DossierAttributeType.TEXT;
+    private String dossierTemplateId;
+
+
+}

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

@@ -0,0 +1,31 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
+
+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
+@AllArgsConstructor
+@NoArgsConstructor
+public class DossierTemplate {
+
+    private String id;
+    private String name;
+    private String description;
+    private OffsetDateTime dateAdded;
+    private OffsetDateTime dateModified;
+    private String createdBy;
+    private String modifiedBy;
+    private OffsetDateTime validFrom;
+    private OffsetDateTime validTo;
+    private boolean deleted;
+    private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
+
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
 public enum DownloadFileType {
     ORIGINAL, PREVIEW, REDACTED, ANNOTATED, FLATTEN

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

@@ -0,0 +1,19 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileAttributesGeneralConfiguration {
+
+    private String dossierTemplateId;
+    private String filenameMappingColumnHeaderName;
+    private String delimiter;
+
+
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -0,0 +1,24 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.OffsetDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportTemplate {
+
+    private String templateId;
+    private String storageId;
+    private String fileName;
+    private OffsetDateTime uploadDate;
+    private boolean multiFileReport;
+    private boolean activeByDefault;
+    private String dossierTemplateId;
+
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
 import lombok.*;
 

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

@@ -0,0 +1,25 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Colors {
+
+    private String dossierTemplateId;
+    private String defaultColor;
+    private String requestAdd;
+    private String requestRemove;
+    private String notRedacted;
+    private String analysisColor;
+    private String updatedColor;
+    private String dictionaryRequestColor;
+    private String manualRedactionColor;
+    private String previewColor;
+
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
 
 import com.iqser.red.service.persistence.service.v1.api.utils.SuppressFBWarnings;
 import lombok.AllArgsConstructor;
@@ -6,34 +6,21 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-
 @Data
-@Entity
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Table(name = "digital_signature")
 @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
 public class DigitalSignature {
 
     public final static String ID = "CONFIG_ID";
 
-    @Id
     private final String id = DigitalSignature.ID;
-
-    @Column
     private String location;
-    @Column
     private String reason;
-    @Column
     private String contactInfo;
-    @Column
     private String certificateName;
-    @Column
     private String password;
-    @Column
-    @Lob
     private byte[] privateKey;
 
 }

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
 
 import lombok.*;
 

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

@@ -0,0 +1,16 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RuleSet {
+
+    private String dossierTemplateId;
+    private long version;
+    private String value;
+
+}

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

@@ -0,0 +1,32 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
+
+import com.iqser.red.service.persistence.service.v1.api.utils.SuppressFBWarnings;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
+public class SMTPConfiguration {
+
+    public final static String ID = "CONFIG_ID";
+
+    private final String id = SMTPConfiguration.ID;
+    private String from;
+    private String fromDisplayName;
+    private String envelopeFrom;
+    private String host;
+    private Integer port;
+    private String replyTo;
+    private String replyToDisplayName;
+    private boolean ssl;
+    private boolean starttls;
+    private boolean auth;
+    private String user;
+    private String password;
+
+}

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

@@ -0,0 +1,23 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Watermark {
+
+    private String dossierTemplateId;
+    private String text;
+    private String hexColor;
+    private int opacity;
+    private int fontSize;
+    private String fontType;
+    private WatermarkOrientation orientation;
+
+
+}

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

@@ -0,0 +1,5 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
+
+public enum WatermarkOrientation {
+    VERTICAL, HORIZONTAL, DIAGONAL
+}

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

@@ -1,4 +1,10 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+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;
@@ -6,13 +12,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.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,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
 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/dossier/Dossier.java

@@ -0,0 +1,35 @@
+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.HashSet;
+import java.util.Set;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Dossier {
+
+    private String id;
+    private String dossierName;
+    private OffsetDateTime date;
+    private String description;
+    private DossierStatus status;
+    private String ownerId;
+    private Set<String> memberIds = new HashSet<>();
+    private Set<String> approverIds = new HashSet<>();
+    private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
+    private boolean watermarkEnabled;
+    private OffsetDateTime softDeletedTime;
+    private OffsetDateTime hardDeletedTime;
+    private OffsetDateTime startDate;
+    private OffsetDateTime dueDate;
+    private String dossierTemplateId;
+
+}

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

@@ -0,0 +1,19 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class DossierAttribute {
+
+    private String dossierId;
+    private String dossierAttributeConfigId;
+    private String value;
+
+}

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

@@ -0,0 +1,5 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
+
+public enum DossierAttributeType {
+    TEXT, NUMBER, DATE, IMAGE
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
 public enum DossierStatus {
     ACTIVE, DELETED

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,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
 import lombok.*;
 

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,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
 import lombok.*;
 

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

@@ -0,0 +1,14 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
+
+import lombok.Data;
+
+@Data
+public class FileAttribute {
+
+    private String fileId;
+    private String fileAttributeConfigId;
+    private String value;
+
+}
+
+

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

@@ -0,0 +1,26 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class FileAttributeConfig {
+
+    private String id;
+    private String csvColumnHeader;
+    private String label;
+    private boolean primaryAttribute;
+    private boolean editable;
+    private boolean filterable;
+    private boolean displayedInFileList;
+    private String placeholder;
+    private FileAttributeType type = FileAttributeType.TEXT;
+    private String dossierTemplateId;
+
+
+}

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

@@ -0,0 +1,5 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
+
+public enum FileAttributeType {
+    TEXT, NUMBER, DATE
+}

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

@@ -0,0 +1,62 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "file")
+public class FileModel {
+
+    private String id;
+    private String filename;
+    private FileStatus status;
+    private FileStatus lastSuccessfulStatus;
+    private int numberOfPages;
+    private OffsetDateTime added;
+    private OffsetDateTime lastUpdated;
+    private OffsetDateTime deleted;
+    private OffsetDateTime lastProcessed;
+    private OffsetDateTime lastIndexed;
+    private int numberOfAnalyses;
+    private String currentReviewer;
+    private String lastReviewer;
+    private OffsetDateTime lastManualRedaction;
+    private boolean hasRedactions;
+    private boolean hasHints;
+    private boolean hasSuggestions;
+    private boolean hasImages;
+    private boolean hasUpdates;
+    private String uploader;
+    private long dictionaryVersion;
+    private long rulesVersion;
+    private long dossierDictionaryVersion;
+    private long legalBasisVersion;
+    private OffsetDateTime approvalDate;
+    private OffsetDateTime lastUploaded;
+    private long analysisDuration;
+    private OffsetDateTime lastOCRTime;
+    private boolean hasAnnotationComments;
+    private boolean excluded;
+    private OffsetDateTime hardDeletedTime;
+    private OffsetDateTime lastFileAttributeChange;
+    private int analysisVersion;
+    private Set<Integer> excludedPages = new HashSet<>();
+    private Map<String, String> fileAttributes = new HashMap<>();
+    private String dossierId;
+
+
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
 public enum FileStatus {
     UNPROCESSED, REPROCESS, PROCESSING, ERROR, DELETED, UNASSIGNED, UNDER_REVIEW, UNDER_APPROVAL, APPROVED, FULLREPROCESS, OCR_PROCESSING, INDEXING

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
 import lombok.Getter;
 

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

@@ -1,17 +1,20 @@
-package com.iqser.red.service.configuration.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-// TODO remove this - compatibility for classpath error
-public class LegalBasisMapping {
+@AllArgsConstructor
+@Builder
+public class LegalBasis {
 
+    private long id;
     private String name;
     private String description;
     private String reason;
 
+
 }

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

@@ -1,24 +1,17 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
 @Data
 @NoArgsConstructor
-@Entity
-@Table(name = "legal_basis_mapping")
 public class LegalBasisMapping {
 
-    @Id
     private String dossierTemplateId;
-    @Column
     private long version;
-
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private List<LegalBasis> legalBasis = new ArrayList<>();
 
 }

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

@@ -0,0 +1,20 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DictionaryEntry {
+
+    private long entryId;
+    private String value;
+    private long version;
+    private boolean deleted;
+    private String typeId;
+
+}

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

@@ -0,0 +1,32 @@
+package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Type {
+
+    private String id;
+    private String type;
+    private String label;
+    private String hexColor;
+    private int rank;
+    private boolean isHint;
+    private boolean isCaseInsensitive;
+    private boolean isRecommendation;
+    private String description;
+    private long version;
+    private boolean addToDictionaryAction;
+    private String dossierTemplateId;
+    private String dossierId;
+    private List<DictionaryEntry> entries = new ArrayList<>();
+
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.download;
 
 import lombok.*;
 

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

@@ -0,0 +1,32 @@
+package com.iqser.red.service.persistence.service.v1.api.model.download;
+
+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
+@NoArgsConstructor
+public class DownloadStatus {
+
+    private String storageId;
+    private String userId;
+    private String filename;
+    private String mimeType;
+    private DownloadStatusValue status;
+    private OffsetDateTime creationDate;
+    private OffsetDateTime lastDownload;
+    private long fileSize;
+    private String dossierId;
+    private List<String> fileIds = new ArrayList<>();
+    private List<DownloadFileType> downloadFileTypes = new ArrayList<>();
+
+
+}

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

@@ -0,0 +1,5 @@
+package com.iqser.red.service.persistence.service.v1.api.model.download;
+
+public enum DownloadStatusValue {
+    QUEUED, GENERATING, READY, FAILED
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.download;
 
 import lombok.*;
 

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.license;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -1,10 +1,6 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.license;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.Instant;
 import java.time.Year;

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

@@ -1,7 +1,7 @@
-package com.iqser.red.service.persistence.service.v1.api.model;
+package com.iqser.red.service.persistence.service.v1.api.model.license;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.FileStatus;
 
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileStatus;
 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/notification/Notification.java

@@ -0,0 +1,28 @@
+package com.iqser.red.service.persistence.service.v1.api.model.notification;
+
+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
+@NoArgsConstructor
+public class Notification {
+
+    private long id;
+    private String userId;
+    private String notificationType;
+    private String issuerId;
+    private OffsetDateTime creationDate;
+    private OffsetDateTime seenDate;
+    private OffsetDateTime readDate;
+    private OffsetDateTime softDeleted;
+    private String notificationDetails;
+    private Map<String, Object> target = new HashMap<>();
+}

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

@@ -1,10 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.audit.AuditModel;
-import com.iqser.red.service.persistence.service.v1.api.model.data.audit.AuditRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.audit.AuditSearchRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.audit.CategoryModel;
-import org.springframework.data.domain.Page;
+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.*;

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

@@ -1,8 +1,8 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.DictionaryEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Type;
+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.*;
@@ -30,23 +30,21 @@ public interface DictionaryResource {
     String ENTRIES_PATH = "/entries";
 
 
-
-
     @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PostMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE , consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     void addEntries(@PathVariable(TYPE_PARAMETER_NAME) String typeId,
                     @RequestBody List<String> entries,
                     @RequestParam(value = "removeCurrent", required = false, defaultValue = "false") boolean removeCurrent);
 
 
     @ResponseStatus(HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE , consumes = MediaType.APPLICATION_JSON_VALUE)
+    @DeleteMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     void deleteEntries(@PathVariable(TYPE_PARAMETER_NAME) String typeId,
                        @RequestBody List<String> entries);
 
 
     @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PostMapping(value = TYPE_PATH + TYPE_PATH_VARIABLE , consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = TYPE_PATH + TYPE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     void updateTypeValue(@PathVariable(TYPE_PARAMETER_NAME) String typeId,
                          @RequestBody Type typeValue);
 
@@ -57,7 +55,7 @@ public interface DictionaryResource {
 
 
     @ResponseStatus(HttpStatus.NO_CONTENT)
-    @DeleteMapping(value = TYPE_PATH + TYPE_PATH_VARIABLE )
+    @DeleteMapping(value = TYPE_PATH + TYPE_PATH_VARIABLE)
     void deleteType(@PathVariable(TYPE_PARAMETER_NAME) String typeId);
 
 
@@ -68,17 +66,17 @@ public interface DictionaryResource {
     List<Type> getAllTypesForDossier(@PathVariable(DOSSIER_ID_PARAMETER_NAME) String dossierId);
 
 
-    @GetMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE , produces = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     Type getDictionaryForType(@PathVariable(TYPE_PARAMETER_NAME) String typeId);
 
-    @GetMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE+ENTRIES_PATH , produces = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE + ENTRIES_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     List<DictionaryEntry> getEntriesForType(@PathVariable(TYPE_PARAMETER_NAME) String typeId);
 
 
     @GetMapping(value = VERSION_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE)
     long getVersion(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId);
 
-    @GetMapping(value = VERSION_PATH + DOSSIER_PATH+DOSSIER_ID_PATH_VARIABLE)
+    @GetMapping(value = VERSION_PATH + DOSSIER_PATH + DOSSIER_ID_PATH_VARIABLE)
     long getVersionForDossier(@PathVariable(DOSSIER_ID_PARAMETER_NAME) String dossierId);
 
 

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

@@ -1,6 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.DigitalSignature;
+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.*;

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

@@ -1,6 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierAttributeConfig;
+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.*;

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

@@ -1,6 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierAttribute;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttribute;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,7 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.CreateOrUpdateDossierRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.Dossier;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.Dossier;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,7 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.CreateOrUpdateDossierTemplateRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierTemplate;
+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.*;

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

@@ -1,9 +1,8 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.DownloadRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.SetDownloadedRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.download.DownloadStatus;
+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.*;

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

@@ -1,7 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.FileAttributesGeneralConfiguration;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.FileAttributeConfig;
+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.*;

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

@@ -1,7 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.ImportCsvRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.ImportCsvResponse;
+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;
@@ -29,6 +29,6 @@ public interface FileAttributesResource {
 
     @PostMapping(value = REST_PATH + SET_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     void setFileAttributes(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId,
-                           @RequestBody Map<String,String> fileAttributes);
+                           @RequestBody Map<String, String> fileAttributes);
 
 }

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

@@ -1,6 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.LegalBasis;
+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.*;

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

@@ -1,7 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.LicenseReport;
-import com.iqser.red.service.persistence.service.v1.api.model.LicenseReportRequest;
+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.*;

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

@@ -1,7 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.*;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.*;
+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.*;

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

@@ -1,7 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.audit.AddNotificationRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.notification.Notification;
+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.*;

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

@@ -1,8 +1,8 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.ReportTemplateDownload;
-import com.iqser.red.service.persistence.service.v1.api.model.ReportTemplateUploadRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.ReportTemplate;
+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.*;
 

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

@@ -1,6 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.JSONPrimitive;
+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.*;

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

@@ -1,6 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.SMTPConfiguration;
+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.*;

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

@@ -1,7 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.File;
+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.*;
@@ -26,23 +26,23 @@ public interface StatusResource {
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = STATUS_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<File> getAllStatuses();
+    List<FileModel> getAllStatuses();
 
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<File> getDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
+    List<FileModel> getDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
 
 
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = STATUS_PATH + DELETED_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<File> getSoftDeletedDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
+    List<FileModel> getSoftDeletedDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
 
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    File getFileStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
+    FileModel getFileStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
 
 
     @PostMapping(value = STATUS_PATH + "/reviewer" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)

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

@@ -1,8 +1,8 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.BinaryFileRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.BinaryFileResult;
-import com.iqser.red.service.persistence.service.v1.api.model.JSONPrimitive;
+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.*;
@@ -12,8 +12,6 @@ import java.util.Set;
 @ResponseStatus(value = HttpStatus.OK)
 public interface UploadResource {
 
-    String SERVICE_NAME = "file-management-service-v1";
-
     String REST_PATH = "/file";
 
     String DELETE_PATH = REST_PATH + "/delete";

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

@@ -1,6 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.ViewedPage;
+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.*;

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

@@ -1,6 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Watermark;
+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.*;

persistence-service-v1/persistence-service-processor-v1/pom.xml

@@ -22,7 +22,13 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>pdftron-redaction-service-api-v1</artifactId>
-            <version>2.18.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>persistence-service-api-v1</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>3.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/configuration/v1/api/model/DigitalSignatureModel.java

@@ -1,20 +0,0 @@
-package com.iqser.red.service.configuration.v1.api.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-// TODO remove this - compatibility for classpath error
-public class DigitalSignatureModel {
-    private String location;
-    private String reason;
-    private String contactInfo;
-    private String certificateName;
-    private byte[] privateKey;
-    private String password;
-}

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

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.management.v1.processor;
 
 import com.iqser.red.service.persistence.management.v1.processor.client.PDFTronRedactionClient;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.CommentEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.audit.AuditEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.ColorsEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.download.DownloadStatusEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.notification.NotificationEntity;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ColorsRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.Comment;
-import com.iqser.red.service.persistence.service.v1.api.model.data.audit.AuditModel;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.Dossier;
-import com.iqser.red.service.persistence.service.v1.api.model.data.download.DownloadStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.data.notification.Notification;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.support.PageJacksonModule;
@@ -19,7 +19,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @Configuration
 @ComponentScan
-@EntityScan(basePackageClasses = {Comment.class, AuditModel.class, Notification.class, Colors.class, Dossier.class, DownloadStatus.class})
+@EntityScan(basePackageClasses = {CommentEntity.class, AuditEntity.class, NotificationEntity.class, ColorsEntity.class, DossierEntity.class, DownloadStatusEntity.class})
 @EnableJpaRepositories(basePackageClasses = ColorsRepository.class)
 @EnableFeignClients(basePackageClasses = {PDFTronRedactionClient.class})
 public class PersistenceServiceProcessorConfiguration {

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/AnnotationEntityId.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.annotations;
+package com.iqser.red.service.persistence.management.v1.processor.entity.annotations;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -14,7 +14,7 @@ import java.io.Serializable;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class AnnotationId implements Serializable {
+public class AnnotationEntityId implements Serializable {
 
     @Column
     private String id;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/CommentEntity.java

@@ -1,10 +1,10 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.annotations;
+package com.iqser.red.service.persistence.management.v1.processor.entity.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.File;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.http.entity.FileEntity;
 
 import javax.persistence.*;
 import java.time.OffsetDateTime;
@@ -15,7 +15,7 @@ import java.time.OffsetDateTime;
 @Table(name = "comment")
 @AllArgsConstructor
 @NoArgsConstructor
-public class Comment {
+public class CommentEntity {
 
     @Id
     @GeneratedValue
@@ -38,5 +38,5 @@ public class Comment {
     private OffsetDateTime softDeletedTime;
 
     @ManyToOne
-    private File fileStatus;
+    private FileEntity fileStatus;
 }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/IdRemovalEntity.java

@@ -1,10 +1,11 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.annotations;
+package com.iqser.red.service.persistence.management.v1.processor.entity.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.File;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.http.entity.FileEntity;
 
 import javax.persistence.*;
 import java.time.OffsetDateTime;
@@ -15,10 +16,10 @@ import java.time.OffsetDateTime;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class IdRemoval {
+public class IdRemovalEntity {
 
     @EmbeddedId
-    private AnnotationId id;
+    private AnnotationEntityId id;
     @Column(name = "user_id")
     private String user;
     @Column
@@ -33,6 +34,6 @@ public class IdRemoval {
     private OffsetDateTime softDeletedTime;
 
     @ManyToOne
-    private File fileStatus;
+    private FileEntity fileStatus;
 
 }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualForceRedactionEntity.java

@@ -1,10 +1,11 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.annotations;
+package com.iqser.red.service.persistence.management.v1.processor.entity.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.File;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.http.entity.FileEntity;
 
 import javax.persistence.*;
 import java.time.OffsetDateTime;
@@ -15,10 +16,10 @@ import java.time.OffsetDateTime;
 @NoArgsConstructor
 @Entity
 @Table(name = "manual_force_redaction")
-public class ManualForceRedaction {
+public class ManualForceRedactionEntity {
 
     @EmbeddedId
-    private AnnotationId id;
+    private AnnotationEntityId id;
     @Column(name = "user_id")
     private String user;
     @Column
@@ -33,6 +34,6 @@ public class ManualForceRedaction {
     private OffsetDateTime softDeletedTime;
 
     @ManyToOne
-    private File fileStatus;
+    private FileEntity fileStatus;
 
 }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualImageRecategorizationEntity.java

@@ -1,10 +1,11 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.annotations;
+package com.iqser.red.service.persistence.management.v1.processor.entity.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.File;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.http.entity.FileEntity;
 
 import javax.persistence.*;
 import java.time.OffsetDateTime;
@@ -15,10 +16,10 @@ import java.time.OffsetDateTime;
 @NoArgsConstructor
 @Entity
 @Table(name = "manual_image_recategorization")
-public class ManualImageRecategorization {
+public class ManualImageRecategorizationEntity {
 
     @EmbeddedId
-    private AnnotationId id;
+    private AnnotationEntityId id;
     @Column(name = "user_id")
     private String user;
     @Column
@@ -33,5 +34,5 @@ public class ManualImageRecategorization {
     private OffsetDateTime softDeletedTime;
 
     @ManyToOne
-    private File fileStatus;
+    private FileEntity fileStatus;
 }