diff --git a/.dev/docker-compose.yaml b/.dev/docker-compose.yaml
index 73613ea2e..00f6876c9 100644
--- a/.dev/docker-compose.yaml
+++ b/.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
diff --git a/persistence-service-v1/persistence-service-api-v1/pom.xml b/persistence-service-v1/persistence-service-api-v1/pom.xml
index fb329153b..72dcd5d83 100644
--- a/persistence-service-v1/persistence-service-api-v1/pom.xml
+++ b/persistence-service-v1/persistence-service-api-v1/pom.xml
@@ -50,18 +50,7 @@
com.iqser.red.commons
jackson-commons
-
- org.hibernate
- hibernate-core
- 5.4.28.Final
- compile
-
-
- org.springframework.data
- spring-data-commons
- 2.4.5
- compile
-
+
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/AddRedactionRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AddRedactionRequest.java
similarity index 72%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/AddRedactionRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AddRedactionRequest.java
index f08fb5d35..faf3292bd 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/AddRedactionRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AnnotationStatus.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AnnotationStatus.java
new file mode 100644
index 000000000..6f4d882d0
--- /dev/null
+++ b/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
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/Comment.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/Comment.java
new file mode 100644
index 000000000..c8d12ebf9
--- /dev/null
+++ b/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;
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CommentRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/CommentRequest.java
similarity index 76%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CommentRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/CommentRequest.java
index dbbbbcfcd..2c8b9c857 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CommentRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ForceRedactionRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ForceRedactionRequest.java
similarity index 69%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ForceRedactionRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ForceRedactionRequest.java
index 22f690d43..47b00145c 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ForceRedactionRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/IdRemoval.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/IdRemoval.java
new file mode 100644
index 000000000..dcf148f45
--- /dev/null
+++ b/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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ImageRecategorizationRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ImageRecategorizationRequest.java
similarity index 69%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ImageRecategorizationRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ImageRecategorizationRequest.java
index fed3a5fcb..ace994f83 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ImageRecategorizationRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/LegalBasisChangeRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/LegalBasisChangeRequest.java
similarity index 69%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/LegalBasisChangeRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/LegalBasisChangeRequest.java
index 522b10f7c..b8a83416f 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/LegalBasisChangeRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ManualAddResponse.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualAddResponse.java
similarity index 77%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ManualAddResponse.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualAddResponse.java
index 54a346141..85615d322 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ManualAddResponse.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualForceRedaction.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualForceRedaction.java
new file mode 100644
index 000000000..4edca2348
--- /dev/null
+++ b/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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualImageRecategorization.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualImageRecategorization.java
new file mode 100644
index 000000000..bd46ab120
--- /dev/null
+++ b/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;
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualLegalBasisChange.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualLegalBasisChange.java
new file mode 100644
index 000000000..9b1c20046
--- /dev/null
+++ b/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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java
new file mode 100644
index 000000000..8c1654c0b
--- /dev/null
+++ b/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 positions = new ArrayList<>();
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ManualRedactions.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactions.java
similarity index 84%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ManualRedactions.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactions.java
index 3f53332a7..9fce6c05a 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ManualRedactions.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Rectangle.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/Rectangle.java
similarity index 78%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Rectangle.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/Rectangle.java
index 0a1ee7b71..a2b9dffc1 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Rectangle.java
+++ b/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)
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/RemoveRedactionRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/RemoveRedactionRequest.java
similarity index 69%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/RemoveRedactionRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/RemoveRedactionRequest.java
index 4eb1b0d5c..2ddec5930 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/RemoveRedactionRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ViewedPage.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ViewedPage.java
new file mode 100644
index 000000000..73202f13b
--- /dev/null
+++ b/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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AddNotificationRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AddNotificationRequest.java
similarity index 85%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AddNotificationRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AddNotificationRequest.java
index 287781c63..28d6f607f 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AddNotificationRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditModel.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditModel.java
new file mode 100644
index 000000000..f1412b869
--- /dev/null
+++ b/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 details = new HashMap<>();
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AuditRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditRequest.java
similarity index 85%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AuditRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditRequest.java
index 16b6318df..648959759 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AuditRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AuditSearchRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditSearchRequest.java
similarity index 86%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AuditSearchRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditSearchRequest.java
index d8d11fe80..18dae1942 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AuditSearchRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/CategoryModel.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/CategoryModel.java
similarity index 74%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/CategoryModel.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/CategoryModel.java
index 7cdc39085..eecba3812 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/CategoryModel.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/JSONPrimitive.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/common/JSONPrimitive.java
similarity index 82%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/JSONPrimitive.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/common/JSONPrimitive.java
index d109733ca..16c6cd023 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/JSONPrimitive.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/common/Page.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/common/Page.java
new file mode 100644
index 000000000..e82fd7c53
--- /dev/null
+++ b/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 {
+
+ @Builder.Default
+ private List elements = new ArrayList<>();
+ private long totalHits;
+ private int page;
+ private int pageSize;
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/AnnotationStatus.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/AnnotationStatus.java
deleted file mode 100644
index 154fe576a..000000000
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/AnnotationStatus.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.annotations;
-
-public enum AnnotationStatus {
- REQUESTED,
- APPROVED,
- DECLINED
-
-}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/download/DownloadStatusValue.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/download/DownloadStatusValue.java
deleted file mode 100644
index cd9ad5027..000000000
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/download/DownloadStatusValue.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.download;
-
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CreateOrUpdateDossierTemplateRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java
similarity index 77%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CreateOrUpdateDossierTemplateRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java
index 174aba5d0..64210c033 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CreateOrUpdateDossierTemplateRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierAttributeConfig.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierAttributeConfig.java
new file mode 100644
index 000000000..f64234980
--- /dev/null
+++ b/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;
+
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierTemplate.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierTemplate.java
new file mode 100644
index 000000000..c5ae65981
--- /dev/null
+++ b/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 downloadFileTypes = new HashSet<>();
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DownloadFileType.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DownloadFileType.java
similarity index 90%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DownloadFileType.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DownloadFileType.java
index dd3ff0496..77d083f4d 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DownloadFileType.java
+++ b/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
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/FileAttributesGeneralConfiguration.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/FileAttributesGeneralConfiguration.java
new file mode 100644
index 000000000..1e3f1d12f
--- /dev/null
+++ b/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;
+
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ImportCsvRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ImportCsvRequest.java
similarity index 74%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ImportCsvRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ImportCsvRequest.java
index cbe251e14..ab4978c26 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ImportCsvRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ImportCsvResponse.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ImportCsvResponse.java
similarity index 83%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ImportCsvResponse.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ImportCsvResponse.java
index 474067899..c45af1b14 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ImportCsvResponse.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplate.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplate.java
new file mode 100644
index 000000000..9a1a700ca
--- /dev/null
+++ b/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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportTemplateDownload.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplateDownload.java
similarity index 74%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportTemplateDownload.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplateDownload.java
index ee24a3aa8..95449c089 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportTemplateDownload.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportTemplateUploadRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplateUploadRequest.java
similarity index 81%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportTemplateUploadRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplateUploadRequest.java
index 830006024..ea1dabbf1 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportTemplateUploadRequest.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/Colors.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/Colors.java
new file mode 100644
index 000000000..28ac1ebc8
--- /dev/null
+++ b/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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/DigitalSignature.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/DigitalSignature.java
similarity index 79%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/DigitalSignature.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/DigitalSignature.java
index 30d345924..fdcb345cc 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/DigitalSignature.java
+++ b/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;
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/DigitalSignatureUpdateModel.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/DigitalSignatureUpdateModel.java
similarity index 74%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/DigitalSignatureUpdateModel.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/DigitalSignatureUpdateModel.java
index 2115c160a..6915076d2 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/DigitalSignatureUpdateModel.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/RuleSet.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/RuleSet.java
new file mode 100644
index 000000000..30ddcefa7
--- /dev/null
+++ b/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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/SMTPConfiguration.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/SMTPConfiguration.java
new file mode 100644
index 000000000..fa85a0147
--- /dev/null
+++ b/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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/Watermark.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/Watermark.java
new file mode 100644
index 000000000..1987e6c88
--- /dev/null
+++ b/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;
+
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/WatermarkOrientation.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/WatermarkOrientation.java
new file mode 100644
index 000000000..59d79a209
--- /dev/null
+++ b/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
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CreateOrUpdateDossierRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/CreateOrUpdateDossierRequest.java
similarity index 83%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CreateOrUpdateDossierRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/CreateOrUpdateDossierRequest.java
index 691cb2f77..a613bfaa3 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CreateOrUpdateDossierRequest.java
+++ b/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
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/DeletedDossier.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DeletedDossier.java
similarity index 69%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/DeletedDossier.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DeletedDossier.java
index fbb9b24c3..ed9b4dcc3 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/DeletedDossier.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/Dossier.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/Dossier.java
new file mode 100644
index 000000000..91d2050ce
--- /dev/null
+++ b/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 memberIds = new HashSet<>();
+ private Set approverIds = new HashSet<>();
+ private Set downloadFileTypes = new HashSet<>();
+ private boolean watermarkEnabled;
+ private OffsetDateTime softDeletedTime;
+ private OffsetDateTime hardDeletedTime;
+ private OffsetDateTime startDate;
+ private OffsetDateTime dueDate;
+ private String dossierTemplateId;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierAttribute.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierAttribute.java
new file mode 100644
index 000000000..a00b0c68b
--- /dev/null
+++ b/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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierAttributeType.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierAttributeType.java
new file mode 100644
index 000000000..aca46c8e9
--- /dev/null
+++ b/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
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierStatus.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierStatus.java
similarity index 82%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierStatus.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierStatus.java
index fad4f4821..2e00a8556 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierStatus.java
+++ b/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
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/BinaryFileRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/BinaryFileRequest.java
similarity index 75%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/BinaryFileRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/BinaryFileRequest.java
index 425218e92..624a2997c 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/BinaryFileRequest.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/BinaryFileResult.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/BinaryFileResult.java
similarity index 70%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/BinaryFileResult.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/BinaryFileResult.java
index 5f8abb1bc..02929b66e 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/BinaryFileResult.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileAttribute.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileAttribute.java
new file mode 100644
index 000000000..a6c0c229a
--- /dev/null
+++ b/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;
+
+}
+
+
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileAttributeConfig.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileAttributeConfig.java
new file mode 100644
index 000000000..cdac75ffe
--- /dev/null
+++ b/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;
+
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileAttributeType.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileAttributeType.java
new file mode 100644
index 000000000..15ae6db0c
--- /dev/null
+++ b/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
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java
new file mode 100644
index 000000000..0919ca63e
--- /dev/null
+++ b/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 excludedPages = new HashSet<>();
+ private Map fileAttributes = new HashMap<>();
+ private String dossierId;
+
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileStatus.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileStatus.java
similarity index 89%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileStatus.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileStatus.java
index ed0ddd4ed..2f91739a8 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileStatus.java
+++ b/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
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/FileType.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java
similarity index 75%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/FileType.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileType.java
index cb4c4fbe2..4db185c15 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/FileType.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/configuration/v1/api/model/LegalBasisMapping.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/legalbasis/LegalBasis.java
similarity index 56%
rename from persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/configuration/v1/api/model/LegalBasisMapping.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/legalbasis/LegalBasis.java
index 95c3d7699..0b921ea80 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/configuration/v1/api/model/LegalBasisMapping.java
+++ b/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;
+
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/LegalBasisMapping.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/legalbasis/LegalBasisMapping.java
similarity index 66%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/LegalBasisMapping.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/legalbasis/LegalBasisMapping.java
index e1ad39f19..f72e0eea2 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/LegalBasisMapping.java
+++ b/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 = new ArrayList<>();
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/DictionaryEntry.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/DictionaryEntry.java
new file mode 100644
index 000000000..9c8406d38
--- /dev/null
+++ b/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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/Type.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/Type.java
new file mode 100644
index 000000000..766341e5f
--- /dev/null
+++ b/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 entries = new ArrayList<>();
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/DownloadRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadRequest.java
similarity index 81%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/DownloadRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadRequest.java
index 9c850c10e..ec0227423 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/DownloadRequest.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadStatus.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadStatus.java
new file mode 100644
index 000000000..bc171efc6
--- /dev/null
+++ b/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 fileIds = new ArrayList<>();
+ private List downloadFileTypes = new ArrayList<>();
+
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadStatusValue.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadStatusValue.java
new file mode 100644
index 000000000..a71ca8d98
--- /dev/null
+++ b/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
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/SetDownloadedRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/SetDownloadedRequest.java
similarity index 73%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/SetDownloadedRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/SetDownloadedRequest.java
index 6cdc33cac..d99baedd2 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/SetDownloadedRequest.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/LicenseReport.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReport.java
similarity index 91%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/LicenseReport.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReport.java
index d45350426..547f09af6 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/LicenseReport.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/LicenseReportRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java
similarity index 81%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/LicenseReportRequest.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java
index e85bd4be4..6c7bd557f 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/LicenseReportRequest.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportData.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/ReportData.java
similarity index 74%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportData.java
rename to persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/ReportData.java
index e54adc093..9f80f69c1 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportData.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/Notification.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/Notification.java
new file mode 100644
index 000000000..0220c2dd9
--- /dev/null
+++ b/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 target = new HashMap<>();
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/AuditResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/AuditResource.java
index 5f09829f4..c4e129696 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/AuditResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DictionaryResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DictionaryResource.java
index 3c9d71128..405c01444 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DictionaryResource.java
+++ b/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 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 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 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 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);
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DigitalSignatureResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DigitalSignatureResource.java
index 984bb1c5b..dd5138e6c 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DigitalSignatureResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesConfigResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesConfigResource.java
index a13434731..c7b27a1f3 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesConfigResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesResource.java
index 746b115fe..9bc8cd486 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierResource.java
index d2061fcd6..bac573ce7 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierTemplateResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierTemplateResource.java
index cd19897d9..1377947bd 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierTemplateResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DownloadResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DownloadResource.java
index 548167db4..bba222ef2 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DownloadResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesConfigResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesConfigResource.java
index 986c7eb9e..4e8adbf92 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesConfigResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesResource.java
index 55024d98a..57d2e967b 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesResource.java
+++ b/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 fileAttributes);
+ @RequestBody Map fileAttributes);
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LegalBasisMappingResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LegalBasisMappingResource.java
index 74e1729f3..7b7811efa 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LegalBasisMappingResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LicenseReportResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LicenseReportResource.java
index 9bfbea81c..ee488194b 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LicenseReportResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ManualRedactionResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ManualRedactionResource.java
index 9baf57732..65b20c199 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ManualRedactionResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/NotificationResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/NotificationResource.java
index 883760d2f..23dcdb924 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/NotificationResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReportTemplateResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReportTemplateResource.java
index f61da3387..8b840581d 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReportTemplateResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RulesResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RulesResource.java
index 799c46269..790fc80f5 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RulesResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/SMTPConfigurationResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/SMTPConfigurationResource.java
index 191e4b3f6..9839a0f59 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/SMTPConfigurationResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java
index 7cbfcde79..fda563f8f 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java
+++ b/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 getAllStatuses();
+ List getAllStatuses();
@ResponseBody
@ResponseStatus(value = HttpStatus.OK)
@GetMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
- List getDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
+ List 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 getSoftDeletedDossierStatus(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
+ List 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)
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/UploadResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/UploadResource.java
index d6e56173f..9653a0064 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/UploadResource.java
+++ b/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";
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ViewedPagesResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ViewedPagesResource.java
index 86ff2f74f..d769cfad9 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ViewedPagesResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/WatermarkResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/WatermarkResource.java
index 383889bd8..d4cb47872 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/WatermarkResource.java
+++ b/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.*;
diff --git a/persistence-service-v1/persistence-service-processor-v1/pom.xml b/persistence-service-v1/persistence-service-processor-v1/pom.xml
index 4a4caa1f2..5637ea92e 100644
--- a/persistence-service-v1/persistence-service-processor-v1/pom.xml
+++ b/persistence-service-v1/persistence-service-processor-v1/pom.xml
@@ -22,7 +22,13 @@
com.iqser.red.service
pdftron-redaction-service-api-v1
- 2.18.0
+
+
+ com.iqser.red.service
+ persistence-service-api-v1
+
+
+ 3.3.0
org.springframework.boot
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/configuration/v1/api/model/DigitalSignatureModel.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/configuration/v1/api/model/DigitalSignatureModel.java
deleted file mode 100644
index 58a3ee655..000000000
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/configuration/v1/api/model/DigitalSignatureModel.java
+++ /dev/null
@@ -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;
-}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/PersistenceServiceProcessorConfiguration.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/PersistenceServiceProcessorConfiguration.java
index 67c27b9f2..51de764f3 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/PersistenceServiceProcessorConfiguration.java
+++ b/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 {
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/AnnotationId.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/AnnotationEntityId.java
similarity index 71%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/AnnotationId.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/AnnotationEntityId.java
index e29dd4525..1317e2dbc 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/AnnotationId.java
+++ b/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;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Comment.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/CommentEntity.java
similarity index 74%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Comment.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/CommentEntity.java
index 349999546..6d59d369a 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Comment.java
+++ b/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;
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/IdRemoval.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/IdRemovalEntity.java
similarity index 65%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/IdRemoval.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/IdRemovalEntity.java
index b5e2dcd0d..201eff752 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/IdRemoval.java
+++ b/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;
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualForceRedaction.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualForceRedactionEntity.java
similarity index 65%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualForceRedaction.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualForceRedactionEntity.java
index 560105f9d..2b7f50120 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualForceRedaction.java
+++ b/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;
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualImageRecategorization.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualImageRecategorizationEntity.java
similarity index 64%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualImageRecategorization.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualImageRecategorizationEntity.java
index 0232e4989..38f25967e 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualImageRecategorization.java
+++ b/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;
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualLegalBasisChange.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualLegalBasisChangeEntity.java
similarity index 65%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualLegalBasisChange.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualLegalBasisChangeEntity.java
index 4cdc88607..948d24f12 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualLegalBasisChange.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualLegalBasisChangeEntity.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_legal_basis_change")
-public class ManualLegalBasisChange {
+public class ManualLegalBasisChangeEntity {
@EmbeddedId
- private AnnotationId id;
+ private AnnotationEntityId id;
@Column(name = "user_id")
private String user;
@@ -34,6 +35,6 @@ public class ManualLegalBasisChange {
private OffsetDateTime softDeletedTime;
@ManyToOne
- private File fileStatus;
+ private FileEntity fileStatus;
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualRedactionEntry.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java
similarity index 68%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualRedactionEntry.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java
index 0574c0f4e..1d6d479fc 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualRedactionEntry.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java
@@ -1,7 +1,7 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.annotations;
-
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.File;
+package com.iqser.red.service.persistence.management.v1.processor.entity.annotations;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -18,10 +18,10 @@ import java.util.List;
@AllArgsConstructor
@NoArgsConstructor
@Table(name = "manual_redaction")
-public class ManualRedactionEntry {
+public class ManualRedactionEntryEntity {
@EmbeddedId
- private AnnotationId id;
+ private AnnotationEntityId id;
@Column(name = "user_id")
private String user;
@Column
@@ -47,10 +47,10 @@ public class ManualRedactionEntry {
@OneToMany(mappedBy = "manualRedaction", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
- private List positions = new ArrayList<>();
+ private List positions = new ArrayList<>();
@ManyToOne
- private File fileStatus;
+ private FileEntity fileStatus;
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/RectangleEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/RectangleEntity.java
new file mode 100644
index 000000000..5c40efb55
--- /dev/null
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/RectangleEntity.java
@@ -0,0 +1,35 @@
+package com.iqser.red.service.persistence.management.v1.processor.entity.annotations;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "rectangle")
+public class RectangleEntity {
+
+ @Id
+ @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)
+ private ManualRedactionEntryEntity manualRedaction;
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ViewedPageEntity.java
similarity index 76%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ViewedPageEntity.java
index d937e4e48..679db9730 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ViewedPageEntity.java
@@ -1,6 +1,6 @@
-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.management.v1.processor.entity.dossier.FileEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -15,7 +15,7 @@ import java.time.OffsetDateTime;
@AllArgsConstructor
@NoArgsConstructor
@Table(name = "viewed_page")
-public class ViewedPage {
+public class ViewedPageEntity {
@EmbeddedId
private ViewedPageId id;
@@ -24,7 +24,7 @@ public class ViewedPage {
@ManyToOne(fetch = FetchType.LAZY)
@MapsId("fileId")
- private File file;
+ private FileEntity file;
@Data
@Builder
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AuditModel.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/audit/AuditEntity.java
similarity index 88%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AuditModel.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/audit/AuditEntity.java
index 06a89930a..f0cca830d 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/audit/AuditModel.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/audit/AuditEntity.java
@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.audit;
+package com.iqser.red.service.persistence.management.v1.processor.entity.audit;
import com.iqser.red.service.persistence.service.v1.api.utils.JSONConverter;
import lombok.AllArgsConstructor;
@@ -17,7 +17,7 @@ import java.util.Map;
@AllArgsConstructor
@Entity
@Table(name = "audit")
-public class AuditModel {
+public class AuditEntity {
@Id
@GeneratedValue
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Colors.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/ColorsEntity.java
similarity index 87%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Colors.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/ColorsEntity.java
index d725e2a8e..b319e38a8 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Colors.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/ColorsEntity.java
@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
+package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -16,7 +16,7 @@ import javax.persistence.Table;
@AllArgsConstructor
@Entity
@Table(name = "color_configuration")
-public class Colors {
+public class ColorsEntity {
@Id
@Column
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/DictionaryEntry.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DictionaryEntryEntity.java
similarity index 73%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/DictionaryEntry.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DictionaryEntryEntity.java
index 67ec9f515..d53ca6ed9 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/DictionaryEntry.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DictionaryEntryEntity.java
@@ -1,9 +1,6 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
-
-import java.io.Serializable;
+package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
import com.fasterxml.jackson.annotation.JsonIgnore;
-
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -17,7 +14,7 @@ import javax.persistence.*;
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "dictionary_entry")
-public class DictionaryEntry implements Serializable {
+public class DictionaryEntryEntity {
@Id
@GeneratedValue
@@ -31,7 +28,7 @@ public class DictionaryEntry implements Serializable {
@JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
- private Type type;
+ private TypeEntity type;
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DigitalSignatureEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DigitalSignatureEntity.java
new file mode 100644
index 000000000..3170b0a79
--- /dev/null
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DigitalSignatureEntity.java
@@ -0,0 +1,39 @@
+package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
+
+import com.iqser.red.service.persistence.service.v1.api.utils.SuppressFBWarnings;
+import lombok.AllArgsConstructor;
+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 DigitalSignatureEntity {
+
+ public final static String ID = "CONFIG_ID";
+
+ @Id
+ private final String id = DigitalSignatureEntity.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;
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/FileAttributesGeneralConfiguration.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/FileAttributesGeneralConfigurationEntity.java
similarity index 65%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/FileAttributesGeneralConfiguration.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/FileAttributesGeneralConfigurationEntity.java
index de14ed70b..18bdbf036 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/FileAttributesGeneralConfiguration.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/FileAttributesGeneralConfigurationEntity.java
@@ -1,7 +1,7 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
+package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierTemplate;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -15,7 +15,7 @@ import javax.persistence.*;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class FileAttributesGeneralConfiguration {
+public class FileAttributesGeneralConfigurationEntity {
@Id
@Column(name = "dossier_template_id")
@@ -28,6 +28,6 @@ public class FileAttributesGeneralConfiguration {
@OneToOne
@JsonIgnore
@MapsId("dossierTemplateId")
- private DossierTemplate dossierTemplate;
+ private DossierTemplateEntity dossierTemplate;
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/LegalBasis.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisEntity.java
similarity index 79%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/LegalBasis.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisEntity.java
index c0b05c07f..8b43ab5d3 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/LegalBasis.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisEntity.java
@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
+package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -13,7 +13,7 @@ import javax.persistence.*;
@AllArgsConstructor
@Builder
@Table(name = "legal_basis")
-public class LegalBasis {
+public class LegalBasisEntity {
@Id
@GeneratedValue
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisMappingEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisMappingEntity.java
new file mode 100644
index 000000000..3e3ae43b5
--- /dev/null
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisMappingEntity.java
@@ -0,0 +1,24 @@
+package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
+
+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 LegalBasisMappingEntity {
+
+ @Id
+ private String dossierTemplateId;
+ @Column
+ private long version;
+
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ private List legalBasis = new ArrayList<>();
+
+}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/RuleSet.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/RuleSetEntity.java
similarity index 65%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/RuleSet.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/RuleSetEntity.java
index da2b5862a..0a7fe668c 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/RuleSet.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/RuleSetEntity.java
@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
+package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -11,7 +11,7 @@ import javax.persistence.*;
@AllArgsConstructor
@Entity
@Table(name = "rule_set")
-public class RuleSet {
+public class RuleSetEntity {
@Id
@Column
@@ -21,6 +21,6 @@ public class RuleSet {
private long version;
@Lob
- @Column(name = "value", columnDefinition="TEXT")
+ @Column(name = "value", columnDefinition = "TEXT")
private String value;
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/SMTPConfigurationEntity.java
similarity index 83%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/SMTPConfigurationEntity.java
index 5f90121ae..77efb86f4 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/SMTPConfigurationEntity.java
@@ -1,7 +1,6 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
+package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
import com.iqser.red.service.persistence.service.v1.api.utils.SuppressFBWarnings;
-
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -19,12 +18,12 @@ import javax.persistence.Table;
@NoArgsConstructor
@Table(name = "smtp_configuration")
@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
-public class SMTPConfiguration {
+public class SMTPConfigurationEntity {
public final static String ID = "CONFIG_ID";
@Id
- private final String id = SMTPConfiguration.ID;
+ private final String id = SMTPConfigurationEntity.ID;
@Column(name = "from_email")
private String from;
@@ -48,7 +47,7 @@ public class SMTPConfiguration {
// if AUTH is true, following must also be set
@Column
private boolean auth;
- @Column(name="username")
+ @Column(name = "username")
private String user;
@Column
private String password;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Type.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/TypeEntity.java
similarity index 73%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Type.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/TypeEntity.java
index e036146f8..3bb21160f 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Type.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/TypeEntity.java
@@ -1,9 +1,8 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
+package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.Dossier;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierTemplate;
-
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -21,7 +20,7 @@ import static javax.persistence.CascadeType.ALL;
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "type")
-public class Type {
+public class TypeEntity {
@Id
private String id;
@@ -47,12 +46,12 @@ public class Type {
private boolean addToDictionaryAction;
@OneToMany(cascade = ALL, mappedBy = "type", orphanRemoval = true, fetch = FetchType.LAZY)
- private List entries = new ArrayList<>();
+ private List entries = new ArrayList<>();
@ManyToOne
@JsonIgnore
@JoinColumn(name = "dossier_template_id")
- private DossierTemplate dossierTemplate;
+ private DossierTemplateEntity dossierTemplate;
@Column(updatable = false, insertable = false, name = "dossier_template_id")
private String dossierTemplateId;
@@ -60,7 +59,7 @@ public class Type {
@ManyToOne
@JsonIgnore
@JoinColumn(name = "dossier_id")
- private Dossier dossier;
+ private DossierEntity dossier;
@Column(updatable = false, insertable = false, name = "dossier_id")
private String dossierId;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Watermark.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/WatermarkEntity.java
similarity index 74%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Watermark.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/WatermarkEntity.java
index 7552afa66..9bd8ff697 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Watermark.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/WatermarkEntity.java
@@ -1,7 +1,7 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
+package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierTemplate;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -15,7 +15,7 @@ import javax.persistence.*;
@Table(name = "watermark_configuration")
@NoArgsConstructor
@AllArgsConstructor
-public class Watermark {
+public class WatermarkEntity {
@Id
@Column
@@ -36,7 +36,7 @@ public class Watermark {
@JsonIgnore
@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "dossier_template_id")
- private DossierTemplate dossierTemplate;
+ private DossierTemplateEntity dossierTemplate;
public enum WatermarkOrientation {
VERTICAL, HORIZONTAL, DIAGONAL
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierAttributeConfig.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierAttributeConfigEntity.java
similarity index 63%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierAttributeConfig.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierAttributeConfigEntity.java
index 845c16f4c..b3d818cda 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierAttributeConfig.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierAttributeConfigEntity.java
@@ -1,5 +1,6 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.management.v1.processor.entity.dossier;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttributeType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -14,7 +15,7 @@ import javax.persistence.*;
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "dossier_attribute_config")
-public class DossierAttributeConfig {
+public class DossierAttributeConfigEntity {
@Id
private String id;
@@ -30,12 +31,7 @@ public class DossierAttributeConfig {
@ManyToOne
- private DossierTemplate dossierTemplate;
-
-
- public enum DossierAttributeType {
- TEXT, NUMBER, DATE, IMAGE
- }
+ private DossierTemplateEntity dossierTemplate;
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierAttribute.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierAttributeEntity.java
similarity index 70%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierAttribute.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierAttributeEntity.java
index e8f8fd0ea..15e1359bd 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierAttribute.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierAttributeEntity.java
@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.management.v1.processor.entity.dossier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor;
@@ -16,10 +16,10 @@ import java.io.Serializable;
@AllArgsConstructor
@NoArgsConstructor
@Builder
-public class DossierAttribute {
+public class DossierAttributeEntity {
@EmbeddedId
- private DossierAttributeId id;
+ private DossierAttributeEntityId id;
@Column
private String value;
@@ -27,18 +27,18 @@ public class DossierAttribute {
@JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
@MapsId("dossierId")
- private Dossier dossier;
+ private DossierEntity dossier;
@JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
@MapsId("dossierAttributeConfigId")
- private DossierAttributeConfig dossierAttributeConfig;
+ private DossierAttributeConfigEntity dossierAttributeConfig;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Embeddable
- public static class DossierAttributeId implements Serializable {
+ public static class DossierAttributeEntityId implements Serializable {
@Column(name = "dossier_id")
private String dossierId;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierEntity.java
similarity index 68%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierEntity.java
index ab71fe5e2..ecb1273eb 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierEntity.java
@@ -1,6 +1,9 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.management.v1.processor.entity.dossier;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Type;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -19,7 +22,7 @@ import java.util.Set;
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "dossier")
-public class Dossier {
+public class DossierEntity {
@Id
private String id;
@@ -66,22 +69,23 @@ public class Dossier {
@Column
private OffsetDateTime dueDate;
+ @JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
- private DossierTemplate dossierTemplate;
+ private DossierTemplateEntity dossierTemplate;
@Column(updatable = false, insertable = false, name = "dossier_template_id")
private String dossierTemplateId;
@Builder.Default
@ManyToMany(fetch = FetchType.LAZY, mappedBy = "dossiers")
- private List reportTemplates = new ArrayList<>();
+ private List reportTemplates = new ArrayList<>();
@Builder.Default
@OneToMany(cascade = CascadeType.ALL, mappedBy = "dossier")
- private List dossierTypes = new ArrayList<>();
+ private List dossierTypes = new ArrayList<>();
@Builder.Default
@OneToMany(cascade = CascadeType.ALL, mappedBy = "dossier")
- private List dossierAttributes = new ArrayList<>();
+ private List dossierAttributes = new ArrayList<>();
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierTemplate.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java
similarity index 66%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierTemplate.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java
index b5267391a..6f3e6c5b6 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierTemplate.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java
@@ -1,8 +1,8 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.management.v1.processor.entity.dossier;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Type;
-
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -22,7 +22,7 @@ import java.util.Set;
@AllArgsConstructor
@NoArgsConstructor
@Table(name = "dossier_template")
-public class DossierTemplate {
+public class DossierTemplateEntity {
@Id
private String id;
@@ -59,17 +59,17 @@ public class DossierTemplate {
@JsonIgnore
@OneToMany(mappedBy = "dossierTemplate")
- private List reportTemplates = new ArrayList<>();
+ private List reportTemplates = new ArrayList<>();
@JsonIgnore
@OneToMany(mappedBy = "dossierTemplate")
- private List dossierTypes = new ArrayList<>();
+ private List dossierTypes = new ArrayList<>();
@JsonIgnore
@OneToMany(mappedBy = "dossierTemplate")
- private List dossiers = new ArrayList<>();
+ private List dossiers = new ArrayList<>();
@JsonIgnore
@OneToMany(mappedBy = "dossierTemplate")
- private List fileAttributeConfigs = new ArrayList<>();
+ private List fileAttributeConfigs = new ArrayList<>();
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileAttributeConfig.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileAttributeConfigEntity.java
similarity index 72%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileAttributeConfig.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileAttributeConfigEntity.java
index a9a98a025..5b2b318f4 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileAttributeConfig.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileAttributeConfigEntity.java
@@ -1,6 +1,7 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.management.v1.processor.entity.dossier;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileAttributeType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -14,7 +15,7 @@ import javax.persistence.*;
@AllArgsConstructor
@Builder
@Table(name = "file_attribute_config")
-public class FileAttributeConfig {
+public class FileAttributeConfigEntity {
@Id
private String id;
@@ -37,12 +38,7 @@ public class FileAttributeConfig {
@ManyToOne
@JsonIgnore
- private DossierTemplate dossierTemplate;
-
-
- public enum FileAttributeType {
- TEXT, NUMBER, DATE
- }
+ private DossierTemplateEntity dossierTemplate;
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileAttribute.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileAttributeEntity.java
similarity index 64%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileAttribute.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileAttributeEntity.java
index f716bf4d0..bc09712d3 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileAttribute.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileAttributeEntity.java
@@ -1,4 +1,4 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.management.v1.processor.entity.dossier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
@@ -9,10 +9,10 @@ import java.io.Serializable;
@Data
@Entity
@Table(name = "file_attribute")
-public class FileAttribute {
+public class FileAttributeEntity {
@EmbeddedId
- private FileAttributeId fileAttributeId;
+ private FileAttributeEntityId fileAttributeId;
@Column
private String value;
@@ -20,17 +20,17 @@ public class FileAttribute {
@JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
@MapsId("fileId")
- private File file;
+ private FileEntity file;
@JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
@MapsId("fileAttributeConfigId")
- private FileAttributeConfig fileAttributeConfig;
+ private FileAttributeConfigEntity fileAttributeConfig;
@Data
@Embeddable
- public static class FileAttributeId implements Serializable {
+ public static class FileAttributeEntityId implements Serializable {
@Column(name = "file_id")
private String fileId;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/File.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java
similarity index 87%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/File.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java
index d708467c6..4b33cb4dc 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/File.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java
@@ -1,7 +1,7 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.management.v1.processor.entity.dossier;
import com.fasterxml.jackson.annotation.JsonIgnore;
-
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -20,7 +20,7 @@ import java.util.Set;
@NoArgsConstructor
@Entity
@Table(name = "file")
-public class File {
+public class FileEntity {
@Id
private String id;
@@ -125,11 +125,11 @@ public class File {
private Set excludedPages = new HashSet<>();
@OneToMany(mappedBy = "file", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
- private List fileAttributes = new ArrayList<>();
+ private List fileAttributes = new ArrayList<>();
@JsonIgnore
@ManyToOne
- private Dossier dossier;
+ private DossierEntity dossier;
@Column(updatable = false, insertable = false, name = "dossier_id")
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/ReportTemplate.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/ReportTemplateEntity.java
similarity index 71%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/ReportTemplate.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/ReportTemplateEntity.java
index 0b96db4c4..c8536fd6a 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/ReportTemplate.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/ReportTemplateEntity.java
@@ -1,7 +1,6 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.dossier;
+package com.iqser.red.service.persistence.management.v1.processor.entity.dossier;
import com.fasterxml.jackson.annotation.JsonIgnore;
-
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -18,7 +17,7 @@ import java.util.List;
@NoArgsConstructor
@Entity
@Table(name = "report_template")
-public class ReportTemplate {
+public class ReportTemplateEntity {
@Id
private String templateId;
@@ -36,13 +35,13 @@ public class ReportTemplate {
@JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
- private DossierTemplate dossierTemplate;
+ private DossierTemplateEntity dossierTemplate;
- @Column(updatable = false,insertable = false,name = "dossier_template_id")
+ @Column(updatable = false, insertable = false, name = "dossier_template_id")
private String dossierTemplateId;
@ManyToMany
@JsonIgnore
- private List dossiers = new ArrayList<>();
+ private List dossiers = new ArrayList<>();
}
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/download/DownloadStatus.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java
similarity index 64%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/download/DownloadStatus.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java
index cb38aefd5..acf46a208 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/download/DownloadStatus.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java
@@ -1,9 +1,8 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.download;
-
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.Dossier;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DownloadFileType;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.File;
+package com.iqser.red.service.persistence.management.v1.processor.entity.download;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -20,7 +19,7 @@ import java.util.List;
@AllArgsConstructor
@NoArgsConstructor
@Table(name = "download_status")
-public class DownloadStatus {
+public class DownloadStatusEntity {
@Id
private String storageId;
@@ -40,10 +39,10 @@ public class DownloadStatus {
private long fileSize;
@ManyToOne
- private Dossier dossier;
+ private DossierEntity dossier;
@ManyToMany
- private List files = new ArrayList<>();
+ private List files = new ArrayList<>();
@ElementCollection
private List downloadFileTypes = new ArrayList<>();
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/notification/Notification.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/notification/NotificationEntity.java
similarity index 89%
rename from persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/notification/Notification.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/notification/NotificationEntity.java
index c9d5e98d3..386a15df1 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/notification/Notification.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/notification/NotificationEntity.java
@@ -1,7 +1,6 @@
-package com.iqser.red.service.persistence.service.v1.api.model.data.notification;
+package com.iqser.red.service.persistence.management.v1.processor.entity.notification;
import com.iqser.red.service.persistence.service.v1.api.utils.JSONConverter;
-
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -18,7 +17,7 @@ import java.util.Map;
@NoArgsConstructor
@Entity
@Table(name = "notification")
-public class Notification {
+public class NotificationEntity {
@Id
@GeneratedValue
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ColorsService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ColorsService.java
index 61b6885cb..17db7ff1e 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ColorsService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ColorsService.java
@@ -1,6 +1,6 @@
package com.iqser.red.service.persistence.management.v1.processor.service;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Colors;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.ColorsEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ColorsRepository;
import lombok.RequiredArgsConstructor;
@@ -19,11 +19,11 @@ public class ColorsService {
colorsRepository.deleteById(dossierTemplateId);
}
- public Colors getColors(String dossierTemplateId) {
+ public ColorsEntity getColors(String dossierTemplateId) {
return colorsRepository.findById(dossierTemplateId).orElseThrow(() -> new NotFoundException("Colors Configuration not found"));
}
- public Colors saveColors(Colors colors) {
+ public ColorsEntity saveColors(ColorsEntity colors) {
return colorsRepository.save(colors);
}
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java
index 6a61c8e1c..8b4a07d2f 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java
@@ -1,8 +1,7 @@
package com.iqser.red.service.persistence.management.v1.processor.service;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.DigitalSignature;
import com.iqser.red.service.persistence.management.v1.processor.client.PDFTronRedactionClient;
-import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DigitalSignatureEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DigitalSignatureRepository;
import lombok.RequiredArgsConstructor;
@@ -22,12 +21,12 @@ public class DigitalSignatureService {
private final PDFTronRedactionClient pdfTronRedactionClient;
public void deleteDigitalSignature() {
- digitalSignatureRepository.deleteById(DigitalSignature.ID);
+ digitalSignatureRepository.deleteById(DigitalSignatureEntity.ID);
}
- public DigitalSignature getDigitalSignature() {
- return digitalSignatureRepository.findById(DigitalSignature.ID).map(digitalSignature -> {
- DigitalSignature result = new DigitalSignature();
+ public DigitalSignatureEntity getDigitalSignature() {
+ return digitalSignatureRepository.findById(DigitalSignatureEntity.ID).map(digitalSignature -> {
+ DigitalSignatureEntity result = new DigitalSignatureEntity();
BeanUtils.copyProperties(digitalSignature, result);
result.setPrivateKey(encryptionDecryptionService.decrypt(digitalSignature.getPrivateKey()));
result.setPassword(encryptionDecryptionService.decrypt(digitalSignature.getPassword()));
@@ -35,11 +34,11 @@ public class DigitalSignatureService {
}).orElseThrow(() -> new NotFoundException("Digital Signature Not found"));
}
- public DigitalSignature saveDigitalSignature(DigitalSignature digitalSignature) {
+ public DigitalSignatureEntity saveDigitalSignature(DigitalSignatureEntity digitalSignature) {
// try {
- // TODO
- // pdfTronRedactionClient.testDigitalCurrentSignature(digitalSignature);
+ // TODO
+ // pdfTronRedactionClient.testDigitalCurrentSignature(digitalSignature);
// } catch (Exception e) {
// throw new BadRequestException("Failed to test digital signature");
// }
@@ -51,9 +50,9 @@ public class DigitalSignatureService {
}
@Transactional
- public void updateDigitalSignature(DigitalSignature digitalSignatureModel) {
+ public void updateDigitalSignature(DigitalSignatureEntity digitalSignatureModel) {
- digitalSignatureRepository.findById(DigitalSignature.ID).ifPresentOrElse(digitalSignature -> {
+ digitalSignatureRepository.findById(DigitalSignatureEntity.ID).ifPresentOrElse(digitalSignature -> {
digitalSignature.setCertificateName(digitalSignatureModel.getCertificateName());
digitalSignature.setLocation(digitalSignatureModel.getLocation());
digitalSignature.setContactInfo(digitalSignatureModel.getContactInfo());
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EmailService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EmailService.java
index ff093c1c6..570700469 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EmailService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EmailService.java
@@ -1,6 +1,6 @@
package com.iqser.red.service.persistence.management.v1.processor.service;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.SMTPConfiguration;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.SMTPConfigurationEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.mail.javamail.JavaMailSender;
@@ -25,7 +25,7 @@ import java.util.Properties;
public class EmailService {
- public void send(SMTPConfiguration smtpConfiguration, String toAddress, String subject, String textBody) {
+ public void send(SMTPConfigurationEntity smtpConfiguration, String toAddress, String subject, String textBody) {
try {
var sender = getJavaMailSender(smtpConfiguration);
@@ -75,7 +75,7 @@ public class EmailService {
return new InternetAddress(email, displayName, "utf-8");
}
- public JavaMailSender getJavaMailSender(SMTPConfiguration smtpConfiguration) {
+ public JavaMailSender getJavaMailSender(SMTPConfigurationEntity smtpConfiguration) {
JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
mailSender.setHost(smtpConfiguration.getHost());
mailSender.setPort(smtpConfiguration.getPort());
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EncryptionDecryptionService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EncryptionDecryptionService.java
index e6915cbf2..be071f77f 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EncryptionDecryptionService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EncryptionDecryptionService.java
@@ -37,14 +37,14 @@ public class EncryptionDecryptionService {
}
@SneakyThrows
- public byte[] encrypt(byte[] bytes){
+ public byte[] encrypt(byte[] bytes) {
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
cipher.init(Cipher.ENCRYPT_MODE, secretKey);
return cipher.doFinal(bytes);
}
@SneakyThrows
- public byte[] decrypt(byte[] bytes){
+ public byte[] decrypt(byte[] bytes) {
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
cipher.init(Cipher.ENCRYPT_MODE, secretKey);
return cipher.doFinal(bytes);
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java
index d09312f49..b4f32a60f 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java
@@ -1,8 +1,8 @@
package com.iqser.red.service.persistence.management.v1.processor.service;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.WatermarkEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.WatermarkRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Watermark;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -23,12 +23,12 @@ public class WatermarkService {
watermarkRepository.deleteById(dossierTemplateId);
}
- public Watermark getWatermark(String dossierTemplateId) {
+ public WatermarkEntity getWatermark(String dossierTemplateId) {
return watermarkRepository.findById(dossierTemplateId).orElseThrow(() -> new NotFoundException("Watermark Configuration not found"));
}
@Transactional
- public Watermark saveWatermark(String dossierTemplateId, Watermark watermark) {
+ public WatermarkEntity saveWatermark(String dossierTemplateId, WatermarkEntity watermark) {
watermarkRepository.findById(dossierTemplateId).ifPresentOrElse(
loadedWatermark -> BeanUtils.copyProperties(watermark, loadedWatermark, "dossierTemplateId")
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/AddRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/AddRedactionPersistenceService.java
index afe0a16e6..6c5b2fa85 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/AddRedactionPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/AddRedactionPersistenceService.java
@@ -1,17 +1,21 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualRedactionEntryEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.RectangleEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ManualRedactionRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.AddRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationId;
-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.ManualRedactionEntry;
+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.Rectangle;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -25,28 +29,39 @@ public class AddRedactionPersistenceService {
public void insert(String fileId, String annotationId, AddRedactionRequest addRedactionRequest) {
- ManualRedactionEntry manualRedactionEntry = new ManualRedactionEntry();
- manualRedactionEntry.setId(new AnnotationId(annotationId, fileId));
+ ManualRedactionEntryEntity manualRedactionEntry = new ManualRedactionEntryEntity();
+ manualRedactionEntry.setId(new AnnotationEntityId(annotationId, fileId));
BeanUtils.copyProperties(addRedactionRequest, manualRedactionEntry);
manualRedactionEntry.setRequestDate(OffsetDateTime.now());
- manualRedactionEntry.setPositions(addRedactionRequest.getPositions());
+ manualRedactionEntry.setPositions(convert(addRedactionRequest.getPositions()));
manualRedactionEntry.setTypeId(addRedactionRequest.getType());
manualRedactionRepository.save(manualRedactionEntry);
}
+ private List convert(List positions) {
- public ManualRedactionEntry findAddRedaction(String fileId, String annotationId) {
+ List rectangleEntities = new ArrayList<>();
+ positions.forEach(p ->{
+ RectangleEntity re = new RectangleEntity();
+ BeanUtils.copyProperties(p,re);
+ rectangleEntities.add(re);
+ });
+ return rectangleEntities;
+ }
- return manualRedactionRepository.findById(new AnnotationId(annotationId, fileId))
+
+ public ManualRedactionEntryEntity findAddRedaction(String fileId, String annotationId) {
+
+ return manualRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId))
.filter(mre -> mre.getSoftDeletedTime() == null)
.orElseThrow(() ->
new NotFoundException("Unknown file/annotation combination: " + fileId + "/" + annotationId));
}
- public Set findAddRedactions(String fileId, boolean includeDeletions) {
+ public Set findAddRedactions(String fileId, boolean includeDeletions) {
return manualRedactionRepository.findByIdFileId(fileId).stream().filter(mre -> includeDeletions || mre.getSoftDeletedTime() == null).collect(Collectors.toSet());
@@ -55,25 +70,25 @@ public class AddRedactionPersistenceService {
@Transactional
public void hardDelete(String fileId, String annotationId) {
- manualRedactionRepository.deleteById(new AnnotationId(annotationId, fileId));
+ manualRedactionRepository.deleteById(new AnnotationEntityId(annotationId, fileId));
}
@Transactional
public void softDelete(String fileId, String annotationId, OffsetDateTime softDeleteTime) {
- manualRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(softDeleteTime));
+ manualRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(softDeleteTime));
}
@Transactional
public void undelete(String fileId, String annotationId) {
- manualRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(null));
+ manualRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(null));
}
@Transactional
public void updateStatus(String fileId, String annotationId, AnnotationStatus annotationStatus) {
- manualRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> {
+ manualRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> {
mre.setProcessedDate(OffsetDateTime.now());
mre.setStatus(annotationStatus);
});
@@ -84,7 +99,7 @@ public class AddRedactionPersistenceService {
@Transactional
public void updateStatus(String fileId, String annotationId, AnnotationStatus annotationStatus, boolean isAddOrRemoveFromDictionary) {
- manualRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> {
+ manualRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> {
mre.setProcessedDate(OffsetDateTime.now());
mre.setStatus(annotationStatus);
mre.setAddToDictionary(isAddOrRemoveFromDictionary);
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/AuditPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/AuditPersistenceService.java
index 4dff70b0c..dc6422875 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/AuditPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/AuditPersistenceService.java
@@ -1,10 +1,10 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.audit.AuditEntity;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.AuditRepository;
-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 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 lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
@@ -32,7 +32,7 @@ public class AuditPersistenceService {
public void insertRecord(AuditRequest auditRequest) {
- var auditModel = new AuditModel();
+ var auditModel = new AuditEntity();
BeanUtils.copyProperties(auditRequest, auditModel);
auditModel.setRecordDate(OffsetDateTime.now());
@@ -45,10 +45,10 @@ public class AuditPersistenceService {
}
- public Page search(AuditSearchRequest auditRequest) {
+ public Page search(AuditSearchRequest auditRequest) {
- AuditModel example = new AuditModel();
+ AuditEntity example = new AuditEntity();
example.setCategory(auditRequest.getCategory());
example.setUserId(auditRequest.getUserId());
example.setObjectId(auditRequest.getObjectId());
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/CommentPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/CommentPersistenceService.java
index f9ac27f52..1a9e92cc7 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/CommentPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/CommentPersistenceService.java
@@ -1,8 +1,8 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.CommentEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.CommentRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.Comment;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -20,27 +20,27 @@ public class CommentPersistenceService {
private final CommentRepository commentRepository;
- public Comment insert(Comment comment) {
+ public CommentEntity insert(CommentEntity comment) {
return commentRepository.save(comment);
}
- public Comment findComment(long commentId) {
+ public CommentEntity findComment(long commentId) {
return commentRepository.findById(commentId).orElseThrow(() -> new NotFoundException("Comment with id: " + commentId + " not found"));
}
- public List findCommentsByAnnotationId(String fileId, String annotationId, boolean includeDeletions) {
+ public List findCommentsByAnnotationId(String fileId, String annotationId, boolean includeDeletions) {
return commentRepository.findByFileIdAndAnnotationId(fileId, annotationId).stream().filter(mre -> includeDeletions || mre.getSoftDeletedTime() == null).collect(Collectors.toList());
}
- public Map> findCommentsByFileID(String fileId, boolean includeDeletions) {
- List comments = commentRepository.findByFileId(fileId).stream().filter(mre -> includeDeletions || mre.getSoftDeletedTime() == null).collect(Collectors.toList());
+ public Map> findCommentsByFileID(String fileId, boolean includeDeletions) {
+ List comments = commentRepository.findByFileId(fileId).stream().filter(mre -> includeDeletions || mre.getSoftDeletedTime() == null).collect(Collectors.toList());
- return comments.stream().collect(Collectors.groupingBy(Comment::getAnnotationId));
+ return comments.stream().collect(Collectors.groupingBy(CommentEntity::getAnnotationId));
}
public boolean fileHasComments(String fileId) {
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DictionaryPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DictionaryPersistenceService.java
index 4156b34c0..0a5aa17f8 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DictionaryPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DictionaryPersistenceService.java
@@ -1,11 +1,11 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.TypeRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Type;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -26,13 +26,13 @@ public class DictionaryPersistenceService {
private final DossierRepository dossierRepository;
- public Type addType(String type, String dossierTemplateId, String hexColor, int rank, boolean isHint,
- boolean caseInsensitive, boolean isRecommendation, String description,
- boolean addToDictionaryAction, String label, String dossierId) {
+ public TypeEntity addType(String type, String dossierTemplateId, String hexColor, int rank, boolean isHint,
+ boolean caseInsensitive, boolean isRecommendation, String description,
+ boolean addToDictionaryAction, String label, String dossierId) {
checkRankAlreadyExists(type, dossierTemplateId, rank, dossierId);
- Type t = new Type();
+ TypeEntity t = new TypeEntity();
t.setId(type + ":" + getTypeIdSuffix(dossierTemplateId, dossierId));
t.setType(type);
t.setDossier(dossierId == null ? null : dossierRepository.getOne(dossierId));
@@ -59,7 +59,7 @@ public class DictionaryPersistenceService {
}
@Transactional
- public void updateType(String typeId, Type typeValueRequest) {
+ public void updateType(String typeId, TypeEntity typeValueRequest) {
typeRepository.findById(typeId).ifPresent((type) -> {
type.setVersion(type.getVersion() + 1);
@@ -69,7 +69,7 @@ public class DictionaryPersistenceService {
}
- public Optional getTypeForRank(String dossierTemplateId, int rank, String dossierId) {
+ public Optional getTypeForRank(String dossierTemplateId, int rank, String dossierId) {
return typeRepository.findOneByDossierTemplateAndDossierAndRank(
dossierTemplateRepository.getOne(dossierTemplateId), dossierId == null ? null : dossierRepository.getOne(dossierId), rank);
@@ -77,7 +77,7 @@ public class DictionaryPersistenceService {
}
- public List getCumulatedTypes(String dossierTemplateId, String dossierId) {
+ public List getCumulatedTypes(String dossierTemplateId, String dossierId) {
var templateTypes = getAllTypesForDossierTemplate(dossierTemplateId);
templateTypes.addAll(getAllTypesForDossier(dossierId));
@@ -85,12 +85,12 @@ public class DictionaryPersistenceService {
}
- public List getAllTypesForDossierTemplate(String dossierTemplateId) {
+ public List getAllTypesForDossierTemplate(String dossierTemplateId) {
return typeRepository.findByDossierTemplateId(dossierTemplateId);
}
- public List getAllTypesForDossier(String dossierId) {
+ public List getAllTypesForDossier(String dossierId) {
return typeRepository.findByDossierId(dossierId);
}
@@ -101,14 +101,14 @@ public class DictionaryPersistenceService {
}
- public Type getType(String typeId) {
+ public TypeEntity getType(String typeId) {
return typeRepository.findById(typeId).orElseThrow(() -> new NotFoundException("Type: " + typeId + " not found"));
}
private void checkRankAlreadyExists(String type, String dossierTemplateId, int rank, String dossierId) {
- Optional existingTypeValueForRank = getTypeForRank(dossierTemplateId, rank, dossierId);
+ Optional existingTypeValueForRank = getTypeForRank(dossierTemplateId, rank, dossierId);
// not the current type - which we are about to upsert -> throw exception
if (existingTypeValueForRank.isPresent() && !existingTypeValueForRank.get().getType().equalsIgnoreCase(type)) {
throw new BadRequestException("Rank already exists: " + rank + " on type: " + existingTypeValueForRank.get()
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributeConfigPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributeConfigPersistenceService.java
index 21fb9c066..7a8e94927 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributeConfigPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributeConfigPersistenceService.java
@@ -1,11 +1,10 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeConfigEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierAttributeConfigRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierAttributeRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierAttributeConfig;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.FileAttributeConfig;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.text.WordUtils;
@@ -23,7 +22,7 @@ public class DossierAttributeConfigPersistenceService {
private final DossierAttributeRepository dossierAttributeRepository;
private final DossierTemplateRepository dossierTemplateRepository;
- public DossierAttributeConfig addOrUpdateDossierAttribute(String dossierTemplateId, DossierAttributeConfig dossierAttributeConfig) {
+ public DossierAttributeConfigEntity addOrUpdateDossierAttribute(String dossierTemplateId, DossierAttributeConfigEntity dossierAttributeConfig) {
var dossierTemplate = dossierTemplateRepository.getOne(dossierTemplateId);
dossierAttributeConfig.setDossierTemplate(dossierTemplate);
if (dossierAttributeConfig.getId() == null) {
@@ -33,7 +32,7 @@ public class DossierAttributeConfigPersistenceService {
return dossierAttributeConfigRepository.save(dossierAttributeConfig);
} else {
- Optional optionalConfig = dossierAttributeConfigRepository.findById(dossierAttributeConfig.getId());
+ Optional optionalConfig = dossierAttributeConfigRepository.findById(dossierAttributeConfig.getId());
if (optionalConfig.isPresent()) {
var config = optionalConfig.get();
@@ -54,12 +53,12 @@ public class DossierAttributeConfigPersistenceService {
}
@Transactional
- public List setDossierAttributesConfig(String dossierTemplateId, List dossierAttributesConfig) {
+ public List setDossierAttributesConfig(String dossierTemplateId, List dossierAttributesConfig) {
- Set toSetIds = dossierAttributesConfig.stream().map(DossierAttributeConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet());
+ Set toSetIds = dossierAttributesConfig.stream().map(DossierAttributeConfigEntity::getId).filter(Objects::nonNull).collect(Collectors.toSet());
var currentConfigs = dossierAttributeConfigRepository.findAllByDossierTemplateId(dossierTemplateId);
- Set configsToRemove = currentConfigs.stream().filter(c -> !toSetIds.contains(c.getId())).collect(Collectors.toSet());
+ Set configsToRemove = currentConfigs.stream().filter(c -> !toSetIds.contains(c.getId())).collect(Collectors.toSet());
dossierAttributesConfig.forEach(fac -> addOrUpdateDossierAttribute(dossierTemplateId, fac));
@@ -84,18 +83,18 @@ public class DossierAttributeConfigPersistenceService {
dossierAttributeIds.forEach(dossierAttributeConfigRepository::deleteById);
}
- public List getDossierAttributes(String dossierTemplateId) {
+ public List getDossierAttributes(String dossierTemplateId) {
return dossierAttributeConfigRepository.findAllByDossierTemplateId(dossierTemplateId);
}
- private void setPlaceholder(DossierAttributeConfig dossierAttributeConfig) {
+ private void setPlaceholder(DossierAttributeConfigEntity dossierAttributeConfig) {
if (dossierAttributeConfig.getPlaceholder() == null || dossierAttributeConfig.getPlaceholder().isEmpty()) {
String placeholder = "{{dossier.attribute." + StringUtils.remove(WordUtils.capitalizeFully(dossierAttributeConfig.getLabel(), ' '), " ") + "}}";
dossierAttributeConfig.setPlaceholder(placeholder);
}
}
- private void uniqueLabelAndPlaceholder(DossierAttributeConfig dossierAttributesConfig) {
+ private void uniqueLabelAndPlaceholder(DossierAttributeConfigEntity dossierAttributesConfig) {
getDossierAttributes(dossierAttributesConfig.getDossierTemplate().getId()).stream().filter(
d -> !d.getId().equals(dossierAttributesConfig.getId())).forEach(other -> {
if (other.getLabel().equalsIgnoreCase(dossierAttributesConfig.getLabel())) {
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributePersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributePersistenceService.java
index 07aa6ebe1..6242791fc 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributePersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierAttributePersistenceService.java
@@ -1,10 +1,10 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierAttributeConfigRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierAttributeRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierAttribute;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -23,8 +23,8 @@ public class DossierAttributePersistenceService {
@Transactional
public void insertDossierAttribute(String dossierId, String dossierAttributeId, String dossierAttributeValue) {
- DossierAttribute dossierAttribute = new DossierAttribute();
- dossierAttribute.setId(new DossierAttribute.DossierAttributeId(null, null));
+ DossierAttributeEntity dossierAttribute = new DossierAttributeEntity();
+ dossierAttribute.setId(new DossierAttributeEntity.DossierAttributeEntityId(null, null));
dossierAttribute.setValue(dossierAttributeValue);
dossierAttribute.setDossier(dossierRepository.getOne(dossierId));
dossierAttribute.setDossierAttributeConfig(dossierAttributeConfigRepository.getOne(dossierAttributeId));
@@ -34,7 +34,7 @@ public class DossierAttributePersistenceService {
@Transactional
public void updateDossierAttribute(String dossierId, String dossierAttributeId, String dossierAttributeValue) {
- dossierAttributeRepository.findById(new DossierAttribute.DossierAttributeId(dossierId, dossierAttributeId)).ifPresent(dossierAttribute -> dossierAttribute.setValue(dossierAttributeValue));
+ dossierAttributeRepository.findById(new DossierAttributeEntity.DossierAttributeEntityId(dossierId, dossierAttributeId)).ifPresent(dossierAttribute -> dossierAttribute.setValue(dossierAttributeValue));
}
@@ -45,15 +45,15 @@ public class DossierAttributePersistenceService {
@Transactional
public void deleteDossierAttribute(String dossierId, String dossierAttributeId) {
- dossierAttributeRepository.deleteById(new DossierAttribute.DossierAttributeId(dossierId, dossierAttributeId));
+ dossierAttributeRepository.deleteById(new DossierAttributeEntity.DossierAttributeEntityId(dossierId, dossierAttributeId));
}
- public List getDossierAttributes(String dossierId) {
+ public List getDossierAttributes(String dossierId) {
return dossierAttributeRepository.findByIdDossierId(dossierId);
}
- public DossierAttribute findOne(String dossierId, String dossierAttributeId) {
- return dossierAttributeRepository.findById(new DossierAttribute.DossierAttributeId(dossierId, dossierAttributeId))
+ public DossierAttributeEntity findOne(String dossierId, String dossierAttributeId) {
+ return dossierAttributeRepository.findById(new DossierAttributeEntity.DossierAttributeEntityId(dossierId, dossierAttributeId))
.orElseThrow(() -> new NotFoundException("Dossier Attribute not set"));
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java
index de3e2ce9f..502d37033 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java
@@ -1,12 +1,12 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
-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.data.dossier.DossierStatus;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.DossierNotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ReportTemplateRepository;
+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.DossierStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -29,9 +29,9 @@ public class DossierPersistenceService {
private final DossierTemplateRepository dossierTemplateRepository;
private final ReportTemplateRepository reportTemplateRepository;
- public Dossier insert(CreateOrUpdateDossierRequest createOrUpdateDossierRequest) {
+ public DossierEntity insert(CreateOrUpdateDossierRequest createOrUpdateDossierRequest) {
- Dossier dossier = new Dossier();
+ DossierEntity dossier = new DossierEntity();
BeanUtils.copyProperties(createOrUpdateDossierRequest, dossier);
dossier.setId(UUID.randomUUID().toString());
dossier.setStatus(DossierStatus.ACTIVE);
@@ -65,7 +65,7 @@ public class DossierPersistenceService {
}
- public Dossier getAndValidateDossier(String dossierId) {
+ public DossierEntity getAndValidateDossier(String dossierId) {
// check whether the dossierId exists and is not deleted
var dossier = findByDossierId(dossierId);
if (dossier == null || dossier.getStatus().equals(DossierStatus.DELETED)) {
@@ -76,17 +76,17 @@ public class DossierPersistenceService {
}
- public Dossier findByDossierId(String dossierId) {
+ public DossierEntity findByDossierId(String dossierId) {
return dossierRepository.findById(dossierId).orElseThrow(() -> new DossierNotFoundException(String.format(DOSSIER_NOT_FOUND_MESSAGE, dossierId)));
}
- public List findAllDossiers() {
+ public List findAllDossiers() {
return dossierRepository.findAll();
}
- public List findSoftDeletedDossiers() {
+ public List findSoftDeletedDossiers() {
return findAllDossiers().stream().filter(d -> d.getSoftDeletedTime() != null).collect(Collectors.toList());
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java
index 78b1e62cd..9f46b7836 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java
@@ -1,10 +1,10 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
-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.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.CreateOrUpdateDossierTemplateRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -26,9 +26,9 @@ public class DossierTemplatePersistenceService {
@Transactional
- public DossierTemplate createOrUpdateDossierTemplate(CreateOrUpdateDossierTemplateRequest createOrUpdateDossierRequest) {
+ public DossierTemplateEntity createOrUpdateDossierTemplate(CreateOrUpdateDossierTemplateRequest createOrUpdateDossierRequest) {
if (createOrUpdateDossierRequest.getDossierTemplateId() != null) {
- Optional dossierTemplate = dossierTemplateRepository.findById(createOrUpdateDossierRequest.getDossierTemplateId());
+ Optional dossierTemplate = dossierTemplateRepository.findById(createOrUpdateDossierRequest.getDossierTemplateId());
if (dossierTemplate.isPresent()) {
dossierTemplate.get().setDateModified(OffsetDateTime.now());
dossierTemplate.get().setModifiedBy(createOrUpdateDossierRequest.getRequestingUser());
@@ -38,7 +38,7 @@ public class DossierTemplatePersistenceService {
throw new NotFoundException(String.format(DOSSIER_TEMPLATE_NOT_FOUND_MESSAGE, createOrUpdateDossierRequest.getDossierTemplateId()));
}
} else {
- DossierTemplate dossierTemplate = new DossierTemplate();
+ DossierTemplateEntity dossierTemplate = new DossierTemplateEntity();
dossierTemplate.setId(UUID.randomUUID().toString());
dossierTemplate.setDateAdded(OffsetDateTime.now());
dossierTemplate.setCreatedBy(createOrUpdateDossierRequest.getRequestingUser());
@@ -49,12 +49,11 @@ public class DossierTemplatePersistenceService {
}
-
- public List getAllDossierTemplates() {
+ public List getAllDossierTemplates() {
return dossierTemplateRepository.findAllWhereDeletedIsFalse();
}
- public DossierTemplate getDossierTemplate(String dossierTemplateId) {
+ public DossierTemplateEntity getDossierTemplate(String dossierTemplateId) {
return dossierTemplateRepository.findById(dossierTemplateId).filter(d -> !d.isDeleted()).orElseThrow(() -> new NotFoundException(String.format(DOSSIER_TEMPLATE_NOT_FOUND_MESSAGE, dossierTemplateId)));
}
@@ -62,12 +61,12 @@ public class DossierTemplatePersistenceService {
public void deleteDossierTemplate(String dossierTemplateId, String deletingUserId) {
dossierTemplateRepository.findById(dossierTemplateId).ifPresentOrElse((dossierTemplate) -> {
- if(dossierTemplate.getDossiers().isEmpty()) {
+ if (dossierTemplate.getDossiers().isEmpty()) {
dossierTemplate.setModifiedBy(deletingUserId);
dossierTemplate.setDateModified(OffsetDateTime.now());
dossierTemplate.setDeleted(true);
- }else{
+ } else {
throw new BadRequestException("Cannot delete dossier template with active dossiers!");
}
}, () -> {
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java
index 097224954..408437886 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java
@@ -1,10 +1,10 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+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.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DownloadStatusRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository;
-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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -19,11 +19,11 @@ public class DownloadStatusPersistenceService {
private final DownloadStatusRepository downloadStatusRepository;
private final FileRepository fileRepository;
- public void createStatus(String userId, String storageId, Dossier dossier, String filename, String mimeType,
+ public void createStatus(String userId, String storageId, DossierEntity dossier, String filename, String mimeType,
List fileIds) {
- DownloadStatus downloadStatus = new DownloadStatus();
+ DownloadStatusEntity downloadStatus = new DownloadStatusEntity();
downloadStatus.setUserId(userId);
downloadStatus.setStorageId(storageId);
downloadStatus.setFilename(filename);
@@ -37,14 +37,14 @@ public class DownloadStatusPersistenceService {
@Transactional
- public void updateStatus(String storageId, DownloadStatus.DownloadStatusValue status) {
+ public void updateStatus(String storageId, DownloadStatusEntity.DownloadStatusValue status) {
downloadStatusRepository.findById(storageId).ifPresent(downloadStatus -> downloadStatus.setStatus(status));
}
@Transactional
- public void updateStatus(String storageId, DownloadStatus.DownloadStatusValue status, long fileSize) {
+ public void updateStatus(String storageId, DownloadStatusEntity.DownloadStatusValue status, long fileSize) {
downloadStatusRepository.findById(storageId).ifPresent(downloadStatus -> {
downloadStatus.setStatus(status);
downloadStatus.setFileSize(fileSize);
@@ -68,7 +68,7 @@ public class DownloadStatusPersistenceService {
}
- public DownloadStatus getStatus(String storageId) {
+ public DownloadStatusEntity getStatus(String storageId) {
return downloadStatusRepository.findById(storageId).orElseThrow(() ->
new NotFoundException(String.format("DownloadStatus not found for storageId: %s", storageId)));
@@ -76,14 +76,14 @@ public class DownloadStatusPersistenceService {
}
- public List getStatusesByUser(String userId) {
+ public List getStatusesByUser(String userId) {
return downloadStatusRepository.findAllByUserId(userId);
}
- public List getStatus() {
+ public List getStatus() {
return downloadStatusRepository.findAll();
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java
index 316609131..fe58f4fb5 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java
@@ -1,6 +1,6 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.DictionaryEntry;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DictionaryEntryEntity;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.EntryRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.TypeRepository;
import lombok.RequiredArgsConstructor;
@@ -26,7 +26,7 @@ public class EntryPersistenceService {
var type = typeRepository.getOne(typeId);
var dictionaryEntries = entries.stream().map(word -> {
- DictionaryEntry entry = new DictionaryEntry();
+ DictionaryEntryEntity entry = new DictionaryEntryEntity();
entry.setVersion(version);
entry.setValue(word);
entry.setType(type);
@@ -48,7 +48,7 @@ public class EntryPersistenceService {
}
- public List getEntries(String typeId) {
+ public List getEntries(String typeId) {
return entryRepository.findByTypeId(typeId);
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileAttributeConfigPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileAttributeConfigPersistenceService.java
index 28243b739..d17d21a7e 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileAttributeConfigPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileAttributeConfigPersistenceService.java
@@ -1,14 +1,14 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.FileAttributesGeneralConfigurationEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeConfigEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileAttributeConfigRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileAttributesGeneralConfigurationRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileAttributesRepository;
-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 lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.text.WordUtils;
@@ -27,7 +27,7 @@ public class FileAttributeConfigPersistenceService {
private final DossierTemplateRepository dossierTemplateRepository;
private final FileAttributesRepository fileAttributesRepository;
- public FileAttributeConfig addOrUpdateFileAttribute(String dossierTemplateId, FileAttributeConfig fileAttributeConfig) {
+ public FileAttributeConfigEntity addOrUpdateFileAttribute(String dossierTemplateId, FileAttributeConfigEntity fileAttributeConfig) {
var dossierTemplate = dossierTemplateRepository.getOne(dossierTemplateId);
fileAttributeConfig.setDossierTemplate(dossierTemplate);
if (fileAttributeConfig.getId() == null) {
@@ -37,7 +37,7 @@ public class FileAttributeConfigPersistenceService {
return fileAttributeConfigRepository.save(fileAttributeConfig);
} else {
- Optional optionalConfig = fileAttributeConfigRepository.findById(fileAttributeConfig.getId());
+ Optional optionalConfig = fileAttributeConfigRepository.findById(fileAttributeConfig.getId());
if (optionalConfig.isPresent()) {
var config = optionalConfig.get();
@@ -61,22 +61,22 @@ public class FileAttributeConfigPersistenceService {
}
}
- public FileAttributesGeneralConfiguration setFileAttributesGeneralConfig(String dossierTemplateId, FileAttributesGeneralConfiguration fileAttributesConfig) {
+ public FileAttributesGeneralConfigurationEntity setFileAttributesGeneralConfig(String dossierTemplateId, FileAttributesGeneralConfigurationEntity fileAttributesConfig) {
fileAttributesConfig.setDossierTemplateId(dossierTemplateId);
fileAttributesConfig.setDossierTemplate(dossierTemplateRepository.getOne(dossierTemplateId));
return fileAttributesGeneralConfigurationRepository.save(fileAttributesConfig);
}
- public FileAttributesGeneralConfiguration getFileAttributesGeneralConfiguration(String dossierTemplateId) {
+ public FileAttributesGeneralConfigurationEntity getFileAttributesGeneralConfiguration(String dossierTemplateId) {
return fileAttributesGeneralConfigurationRepository.findById(dossierTemplateId).orElseThrow(() -> new NotFoundException("File Attribute Config not found"));
}
@Transactional
- public List setFileAttributesConfig(String dossierTemplateId, List fileAttributesConfig) {
+ public List setFileAttributesConfig(String dossierTemplateId, List fileAttributesConfig) {
- Set toSetIds = fileAttributesConfig.stream().map(FileAttributeConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet());
+ Set toSetIds = fileAttributesConfig.stream().map(FileAttributeConfigEntity::getId).filter(Objects::nonNull).collect(Collectors.toSet());
var currentConfigs = fileAttributeConfigRepository.findByDossierTemplateId(dossierTemplateId);
- Set configsToRemove = currentConfigs.stream().filter(c -> !toSetIds.contains(c.getId())).collect(Collectors.toSet());
+ Set configsToRemove = currentConfigs.stream().filter(c -> !toSetIds.contains(c.getId())).collect(Collectors.toSet());
fileAttributesConfig.forEach(fac -> addOrUpdateFileAttribute(dossierTemplateId, fac));
@@ -103,18 +103,18 @@ public class FileAttributeConfigPersistenceService {
});
}
- public List getFileAttributes(String dossierTemplateId) {
+ public List getFileAttributes(String dossierTemplateId) {
return fileAttributeConfigRepository.findByDossierTemplateId(dossierTemplateId);
}
- private void setPlaceholder(FileAttributeConfig fileAttributeConfig) {
+ private void setPlaceholder(FileAttributeConfigEntity fileAttributeConfig) {
if (fileAttributeConfig.getPlaceholder() == null || fileAttributeConfig.getPlaceholder().isEmpty()) {
String placeholder = "{{file.attribute." + StringUtils.remove(WordUtils.capitalizeFully(fileAttributeConfig.getLabel(), ' '), " ") + "}}";
fileAttributeConfig.setPlaceholder(placeholder);
}
}
- private void uniqueLabelAndPlaceholder(FileAttributeConfig fileAttributeConfig) {
+ private void uniqueLabelAndPlaceholder(FileAttributeConfigEntity fileAttributeConfig) {
getFileAttributes(fileAttributeConfig.getDossierTemplate().getId()).stream().filter(
d -> !d.getId().equals(fileAttributeConfig.getId())).forEach(other -> {
if (other.getLabel().equalsIgnoreCase(fileAttributeConfig.getLabel())) {
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
index 21b52e3b6..678146c56 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
@@ -1,22 +1,19 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
-import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.File;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.FileAttribute;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.FileAttributeConfig;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.FileStatus;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
+import java.io.File;
import java.time.OffsetDateTime;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import java.util.stream.Collectors;
@Service
@@ -29,7 +26,7 @@ public class FileStatusPersistenceService {
public void createStatus(String dossierId, String fileId, String filename, String uploader) {
- File file = new File();
+ FileEntity file = new FileEntity();
file.setId(fileId);
file.setDossier(dossierRepository.getOne(dossierId));
file.setFilename(filename);
@@ -85,7 +82,7 @@ public class FileStatusPersistenceService {
@Transactional
- public void updateStatus(String fileId, FileStatus status, String uploader) {
+ public void updateStatus(String fileId, FileStatus status, String uploader) {
if (status.equals(FileStatus.UNASSIGNED) || status.equals(FileStatus.UNPROCESSED)) {
throw new IllegalArgumentException("please use specific methods for these calls!");
@@ -113,7 +110,7 @@ public class FileStatusPersistenceService {
}
@Transactional
- public void setUpdateStatusIndexingSuccessful( String fileId, FileStatus status) {
+ public void setUpdateStatusIndexingSuccessful(String fileId, FileStatus status) {
fileRepository.findById(fileId).ifPresentOrElse((file) -> {
file.setStatus(status);
@@ -125,7 +122,7 @@ public class FileStatusPersistenceService {
}
@Transactional
- public void updateLastOCRTime( String fileId, OffsetDateTime time) {
+ public void updateLastOCRTime(String fileId, OffsetDateTime time) {
fileRepository.findById(fileId).ifPresentOrElse((file) -> {
file.setLastOCRTime(time);
@@ -169,7 +166,7 @@ public class FileStatusPersistenceService {
}
@Transactional
- public void setFileAttributes(String fileId, List fileAttributes) {
+ public void setFileAttributes(String fileId, List fileAttributes) {
fileRepository.findById(fileId).ifPresentOrElse((file) -> {
file.setLastFileAttributeChange(OffsetDateTime.now());
@@ -193,18 +190,18 @@ public class FileStatusPersistenceService {
}
- public File getStatus(String fileId) {
+ public FileEntity getStatus(String fileId) {
return fileRepository.findById(fileId).orElseThrow(() -> new NotFoundException("Unknown file=" + fileId));
}
- public List getStatusesForDossier(String dossierId) {
+ public List getStatusesForDossier(String dossierId) {
return fileRepository.findByDossierId(dossierId);
}
- public List getAllStatuses() {
+ public List getAllStatuses() {
return fileRepository.findAll();
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ForceRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ForceRedactionPersistenceService.java
index 0abbb9308..58b00b2b5 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ForceRedactionPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ForceRedactionPersistenceService.java
@@ -1,12 +1,12 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualForceRedactionEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ForceRedactionRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.ForceRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationId;
-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.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ForceRedactionRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -26,8 +26,8 @@ public class ForceRedactionPersistenceService {
public void insert(String fileId, ForceRedactionRequest forceRedactionRequest) {
- ManualForceRedaction manualForceRedaction = new ManualForceRedaction();
- manualForceRedaction.setId(new AnnotationId(forceRedactionRequest.getAnnotationId(), fileId));
+ ManualForceRedactionEntity manualForceRedaction = new ManualForceRedactionEntity();
+ manualForceRedaction.setId(new AnnotationEntityId(forceRedactionRequest.getAnnotationId(), fileId));
BeanUtils.copyProperties(forceRedactionRequest, manualForceRedaction);
manualForceRedaction.setRequestDate(OffsetDateTime.now());
@@ -36,7 +36,7 @@ public class ForceRedactionPersistenceService {
@Transactional
public void updateStatus(String fileId, String annotationId, AnnotationStatus annotationStatus) {
- forceRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> {
+ forceRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> {
mre.setProcessedDate(OffsetDateTime.now());
mre.setStatus(annotationStatus);
});
@@ -45,29 +45,29 @@ public class ForceRedactionPersistenceService {
@Transactional
public void hardDelete(String fileId, String annotationId) {
- forceRedactionRepository.deleteById(new AnnotationId(annotationId, fileId));
+ forceRedactionRepository.deleteById(new AnnotationEntityId(annotationId, fileId));
}
@Transactional
public void softDelete(String fileId, String annotationId, OffsetDateTime softDeleteTime) {
- forceRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(softDeleteTime));
+ forceRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(softDeleteTime));
}
@Transactional
public void undelete(String fileId, String annotationId) {
- forceRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(null));
+ forceRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(null));
}
- public ManualForceRedaction findForceRedaction(String fileId, String annotationId) {
+ public ManualForceRedactionEntity findForceRedaction(String fileId, String annotationId) {
- return forceRedactionRepository.findById(new AnnotationId(annotationId, fileId))
+ return forceRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId))
.filter(mre -> mre.getSoftDeletedTime() == null)
.orElseThrow(() ->
new NotFoundException("Unknown file/annotation combination: " + fileId + "/" + annotationId));
}
- public Set findForceRedactions(String fileId, boolean includeDeletions) {
+ public Set findForceRedactions(String fileId, boolean includeDeletions) {
return forceRedactionRepository.findByIdFileId(fileId).stream().filter(mre -> includeDeletions || mre.getSoftDeletedTime() == null).collect(Collectors.toSet());
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ImageRecategorizationPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ImageRecategorizationPersistenceService.java
index d22f617e2..c945c3cba 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ImageRecategorizationPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ImageRecategorizationPersistenceService.java
@@ -1,11 +1,11 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualImageRecategorizationEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ImageRecategorizationRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.ImageRecategorizationRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationId;
-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.ManualImageRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImageRecategorizationRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -24,8 +24,8 @@ public class ImageRecategorizationPersistenceService {
public void insert(String fileId, ImageRecategorizationRequest imageRecategorizationRequest) {
- ManualImageRecategorization manualImageRecategorization = new ManualImageRecategorization();
- manualImageRecategorization.setId(new AnnotationId(imageRecategorizationRequest.getAnnotationId(), fileId));
+ ManualImageRecategorizationEntity manualImageRecategorization = new ManualImageRecategorizationEntity();
+ manualImageRecategorization.setId(new AnnotationEntityId(imageRecategorizationRequest.getAnnotationId(), fileId));
BeanUtils.copyProperties(imageRecategorizationRequest, manualImageRecategorization);
manualImageRecategorization.setRequestDate(OffsetDateTime.now());
imageRecategorizationRepository.save(manualImageRecategorization);
@@ -35,7 +35,7 @@ public class ImageRecategorizationPersistenceService {
@Transactional
public void updateStatus(String fileId, String annotationId, AnnotationStatus annotationStatus) {
- imageRecategorizationRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> {
+ imageRecategorizationRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> {
mre.setProcessedDate(OffsetDateTime.now());
mre.setStatus(annotationStatus);
});
@@ -44,30 +44,30 @@ public class ImageRecategorizationPersistenceService {
@Transactional
public void hardDelete(String fileId, String annotationId) {
- imageRecategorizationRepository.deleteById(new AnnotationId(annotationId, fileId));
+ imageRecategorizationRepository.deleteById(new AnnotationEntityId(annotationId, fileId));
}
@Transactional
public void softDelete(String fileId, String annotationId, OffsetDateTime softDeleteTime) {
- imageRecategorizationRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(softDeleteTime));
+ imageRecategorizationRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(softDeleteTime));
}
@Transactional
public void undelete(String fileId, String annotationId) {
- imageRecategorizationRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(null));
+ imageRecategorizationRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(null));
}
- public ManualImageRecategorization findRecategorization(String fileId, String annotationId) {
+ public ManualImageRecategorizationEntity findRecategorization(String fileId, String annotationId) {
- return imageRecategorizationRepository.findById(new AnnotationId(annotationId, fileId))
+ return imageRecategorizationRepository.findById(new AnnotationEntityId(annotationId, fileId))
.filter(mre -> mre.getSoftDeletedTime() == null)
.orElseThrow(() ->
new NotFoundException("Unknown file/annotation combination: " + fileId + "/" + annotationId));
}
- public Set findRecategorizations(String fileId, boolean includeDeletions) {
+ public Set findRecategorizations(String fileId, boolean includeDeletions) {
return imageRecategorizationRepository.findByIdFileId(fileId).stream().filter(mre -> includeDeletions || mre.getSoftDeletedTime() == null).collect(Collectors.toSet());
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisChangePersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisChangePersistenceService.java
index 91b52e6b6..8618d3bfa 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisChangePersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisChangePersistenceService.java
@@ -1,11 +1,11 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualLegalBasisChangeEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.LegalBasisChangeRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.LegalBasisChangeRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationId;
-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.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.LegalBasisChangeRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -24,8 +24,8 @@ public class LegalBasisChangePersistenceService {
public void insert(String fileId, LegalBasisChangeRequest legalBasisChangeRequest) {
- ManualLegalBasisChange manualLegalBasisChange = new ManualLegalBasisChange();
- manualLegalBasisChange.setId(new AnnotationId(legalBasisChangeRequest.getAnnotationId(), fileId));
+ ManualLegalBasisChangeEntity manualLegalBasisChange = new ManualLegalBasisChangeEntity();
+ manualLegalBasisChange.setId(new AnnotationEntityId(legalBasisChangeRequest.getAnnotationId(), fileId));
BeanUtils.copyProperties(legalBasisChangeRequest, manualLegalBasisChange);
manualLegalBasisChange.setRequestDate(OffsetDateTime.now());
legalBasisChangeRepository.save(manualLegalBasisChange);
@@ -34,26 +34,26 @@ public class LegalBasisChangePersistenceService {
@Transactional
public void hardDelete(String fileId, String annotationId) {
- legalBasisChangeRepository.deleteById(new AnnotationId(annotationId, fileId));
+ legalBasisChangeRepository.deleteById(new AnnotationEntityId(annotationId, fileId));
}
@Transactional
public void softDelete(String fileId, String annotationId, OffsetDateTime softDeleteTime) {
- legalBasisChangeRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(softDeleteTime));
+ legalBasisChangeRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(softDeleteTime));
}
@Transactional
public void undelete(String fileId, String annotationId) {
- legalBasisChangeRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(null));
+ legalBasisChangeRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(null));
}
@Transactional
public void updateStatus(String fileId, String annotationId, AnnotationStatus annotationStatus) {
- legalBasisChangeRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> {
+ legalBasisChangeRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> {
mre.setProcessedDate(OffsetDateTime.now());
mre.setStatus(annotationStatus);
});
@@ -61,15 +61,15 @@ public class LegalBasisChangePersistenceService {
}
- public ManualLegalBasisChange findLegalBasisChange(String fileId, String annotationId) {
- return legalBasisChangeRepository.findById(new AnnotationId(annotationId, fileId))
+ public ManualLegalBasisChangeEntity findLegalBasisChange(String fileId, String annotationId) {
+ return legalBasisChangeRepository.findById(new AnnotationEntityId(annotationId, fileId))
.filter(mre -> mre.getSoftDeletedTime() == null)
.orElseThrow(() ->
new NotFoundException("Unknown file/annotation combination: " + fileId + "/" + annotationId));
}
- public Set findLegalBasisChanges(String fileId, boolean includeDeletions) {
+ public Set findLegalBasisChanges(String fileId, boolean includeDeletions) {
return legalBasisChangeRepository.findByIdFileId(fileId).stream().filter(mre -> includeDeletions || mre.getSoftDeletedTime() == null).collect(Collectors.toSet());
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPersistenceService.java
index 9201fbebf..0b3267a33 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPersistenceService.java
@@ -1,9 +1,9 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.notification.NotificationEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.NotificationRepository;
-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 lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
@@ -24,7 +24,7 @@ public class NotificationPersistenceService {
@SneakyThrows
public void insertNotification(AddNotificationRequest addNotificationRequest) {
- var notification = new Notification();
+ var notification = new NotificationEntity();
BeanUtils.copyProperties(addNotificationRequest, notification);
notification.setCreationDate(OffsetDateTime.now());
@@ -62,7 +62,7 @@ public class NotificationPersistenceService {
}
- public List getNotifications(String userId, boolean includeSeen) {
+ public List getNotifications(String userId, boolean includeSeen) {
if (includeSeen) {
return notificationRepository.findForUser(userId);
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RemoveRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RemoveRedactionPersistenceService.java
index 124f710fc..306b683aa 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RemoveRedactionPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RemoveRedactionPersistenceService.java
@@ -1,11 +1,11 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.IdRemovalEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.RemoveRedactionRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.RemoveRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationId;
-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.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.RemoveRedactionRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -26,8 +26,8 @@ public class RemoveRedactionPersistenceService {
public void insert(String fileId, RemoveRedactionRequest removeRedactionRequest) {
- IdRemoval idRemoval = new IdRemoval();
- idRemoval.setId(new AnnotationId(removeRedactionRequest.getAnnotationId(), fileId));
+ IdRemovalEntity idRemoval = new IdRemovalEntity();
+ idRemoval.setId(new AnnotationEntityId(removeRedactionRequest.getAnnotationId(), fileId));
BeanUtils.copyProperties(removeRedactionRequest, idRemoval);
idRemoval.setRequestDate(OffsetDateTime.now());
@@ -35,38 +35,38 @@ public class RemoveRedactionPersistenceService {
}
- public IdRemoval findRemoveRedaction(String fileId, String annotationId) {
+ public IdRemovalEntity findRemoveRedaction(String fileId, String annotationId) {
- return removeRedactionRepository.findById(new AnnotationId(annotationId, fileId))
+ return removeRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId))
.filter(mre -> mre.getSoftDeletedTime() == null)
.orElseThrow(() ->
new NotFoundException("Unknown file/annotation combination: " + fileId + "/" + annotationId));
}
- public Set findRemoveRedactions(String fileId, boolean includeDeletions) {
+ public Set findRemoveRedactions(String fileId, boolean includeDeletions) {
return removeRedactionRepository.findByIdFileId(fileId).stream().filter(mre -> includeDeletions || mre.getSoftDeletedTime() == null).collect(Collectors.toSet());
}
@Transactional
public void hardDelete(String fileId, String annotationId) {
- removeRedactionRepository.deleteById(new AnnotationId(annotationId, fileId));
+ removeRedactionRepository.deleteById(new AnnotationEntityId(annotationId, fileId));
}
@Transactional
public void softDelete(String fileId, String annotationId, OffsetDateTime softDeleteTime) {
- removeRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(softDeleteTime));
+ removeRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(softDeleteTime));
}
@Transactional
public void undelete(String fileId, String annotationId) {
- removeRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(null));
+ removeRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> mre.setSoftDeletedTime(null));
}
@Transactional
public void updateStatus(String fileId, String annotationId, AnnotationStatus annotationStatus) {
- removeRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> {
+ removeRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> {
mre.setProcessedDate(OffsetDateTime.now());
mre.setStatus(annotationStatus);
});
@@ -76,7 +76,7 @@ public class RemoveRedactionPersistenceService {
@Transactional
public void updateStatus(String fileId, String annotationId, AnnotationStatus annotationStatus, boolean isAddOrRemoveFromDictionary) {
- removeRedactionRepository.findById(new AnnotationId(annotationId, fileId)).ifPresent(mre -> {
+ removeRedactionRepository.findById(new AnnotationEntityId(annotationId, fileId)).ifPresent(mre -> {
mre.setProcessedDate(OffsetDateTime.now());
mre.setStatus(annotationStatus);
mre.setRemoveFromDictionary(isAddOrRemoveFromDictionary);
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ReportTemplatePersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ReportTemplatePersistenceService.java
index 918f3ecfc..39e8f9933 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ReportTemplatePersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ReportTemplatePersistenceService.java
@@ -1,6 +1,6 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.ReportTemplate;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.ReportTemplateEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ReportTemplateRepository;
@@ -21,7 +21,7 @@ public class ReportTemplatePersistenceService {
public void insert(String dossierTemplateId, String templateId, String storageId, String templateName,
boolean activeByDefault, boolean multiFileReport) {
- ReportTemplate reportTemplate = new ReportTemplate();
+ ReportTemplateEntity reportTemplate = new ReportTemplateEntity();
reportTemplate.setTemplateId(templateId);
reportTemplate.setDossierTemplate(dossierTemplateRepository.getOne(dossierTemplateId));
reportTemplate.setStorageId(storageId);
@@ -39,13 +39,13 @@ public class ReportTemplatePersistenceService {
reportTemplateRepository.deleteById(templateId);
}
- public List findByDossierTemplateId(String dossierTemplateId) {
+ public List findByDossierTemplateId(String dossierTemplateId) {
return reportTemplateRepository.findAllByDossierTemplateId(dossierTemplateId);
}
- public ReportTemplate find(String templateId) {
+ public ReportTemplateEntity find(String templateId) {
return reportTemplateRepository.findById(templateId).orElseThrow(() -> new NotFoundException("Report Template not found: " + templateId));
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RulesPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RulesPersistenceService.java
index 53fd51625..fb578e6ca 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RulesPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RulesPersistenceService.java
@@ -1,8 +1,8 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.RuleSetEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.RuleSetRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.RuleSet;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -13,12 +13,10 @@ import javax.transaction.Transactional;
@SuppressWarnings("PMD.TooManyStaticImports")
public class RulesPersistenceService {
+ private static final String RULES_NOT_FOUND = "Could not find rules in database.";
private final RuleSetRepository ruleSetRepository;
- private static final String RULES_NOT_FOUND = "Could not find rules in database.";
-
-
- public RuleSet getRules(String dossierTemplateId) {
+ public RuleSetEntity getRules(String dossierTemplateId) {
return ruleSetRepository.findById(dossierTemplateId).orElseThrow(() -> new NotFoundException(RULES_NOT_FOUND));
}
@@ -29,7 +27,7 @@ public class RulesPersistenceService {
r.setValue(rules);
r.setVersion(r.getVersion() + 1);
}, () -> {
- RuleSet ruleSet = new RuleSet();
+ RuleSetEntity ruleSet = new RuleSetEntity();
ruleSet.setDossierTemplateId(dossierTemplateId);
ruleSet.setValue(rules);
ruleSet.setVersion(1);
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/SMTPConfigurationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/SMTPConfigurationService.java
index 93358565a..1d8d4be46 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/SMTPConfigurationService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/SMTPConfigurationService.java
@@ -1,6 +1,6 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.SMTPConfiguration;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.SMTPConfigurationEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.SMTPRepository;
import lombok.RequiredArgsConstructor;
@@ -18,14 +18,14 @@ public class SMTPConfigurationService {
@Transactional
public void deleteConfiguration() {
- smtpRepository.deleteById(SMTPConfiguration.ID);
+ smtpRepository.deleteById(SMTPConfigurationEntity.ID);
}
- public SMTPConfiguration getConfiguration() {
- return smtpRepository.findById(SMTPConfiguration.ID).orElseThrow(() -> new NotFoundException("SMTP Configuration not found"));
+ public SMTPConfigurationEntity getConfiguration() {
+ return smtpRepository.findById(SMTPConfigurationEntity.ID).orElseThrow(() -> new NotFoundException("SMTP Configuration not found"));
}
- public SMTPConfiguration saveConfiguration(SMTPConfiguration smtpConfiguration) {
+ public SMTPConfigurationEntity saveConfiguration(SMTPConfigurationEntity smtpConfiguration) {
return smtpRepository.save(smtpConfiguration);
}
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java
index fb2c83bb0..5d265e70e 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java
@@ -1,8 +1,8 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ViewedPageEntity;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ViewedPagesRepository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.ViewedPage;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -19,9 +19,9 @@ public class ViewedPagesPersistenceService {
public void insertPage(String fileId, String userId, int page) {
- var viewedPage = new ViewedPage();
+ var viewedPage = new ViewedPageEntity();
viewedPage.setViewedTime(OffsetDateTime.now());
- viewedPage.setId(new ViewedPage.ViewedPageId(null, page, userId));
+ viewedPage.setId(new ViewedPageEntity.ViewedPageId(null, page, userId));
viewedPage.setFile(fileRepository.getOne(fileId));
viewedPagesRepository.save(viewedPage);
}
@@ -29,11 +29,11 @@ public class ViewedPagesPersistenceService {
@Transactional
public void removePage(String fileId, String role, int page) {
- viewedPagesRepository.deleteById(new ViewedPage.ViewedPageId(fileId, page, role));
+ viewedPagesRepository.deleteById(new ViewedPageEntity.ViewedPageId(fileId, page, role));
}
- public List findViewedPages(String fileId, String userId) {
+ public List findViewedPages(String fileId, String userId) {
return viewedPagesRepository.findByFileIdAndIdUserId(fileId, userId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/AuditRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/AuditRepository.java
index 832ec3ec8..ec22c7663 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/AuditRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/AuditRepository.java
@@ -1,17 +1,15 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-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.CategoryModel;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
+import com.iqser.red.service.persistence.management.v1.processor.entity.audit.AuditEntity;
+import com.iqser.red.service.persistence.service.v1.api.model.audit.CategoryModel;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
-public interface AuditRepository extends JpaRepository {
+public interface AuditRepository extends JpaRepository {
- @Query("SELECT new com.iqser.red.service.persistence.service.v1.api.model.data.audit.CategoryModel(a.category, count(a)) FROM AuditModel a GROUP BY a.category")
+ @Query("SELECT new com.iqser.red.service.persistence.service.v1.api.model.audit.CategoryModel(a.category, count(a)) FROM AuditEntity a GROUP BY a.category")
List findCategories();
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ColorsRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ColorsRepository.java
index f62348779..b50cccbc5 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ColorsRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ColorsRepository.java
@@ -1,7 +1,7 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Colors;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.ColorsEntity;
import org.springframework.data.jpa.repository.JpaRepository;
-public interface ColorsRepository extends JpaRepository {
+public interface ColorsRepository extends JpaRepository {
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/CommentRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/CommentRepository.java
index c98842611..649971d09 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/CommentRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/CommentRepository.java
@@ -1,15 +1,15 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.Comment;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.CommentEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface CommentRepository extends JpaRepository {
+public interface CommentRepository extends JpaRepository {
- List findByFileIdAndAnnotationId(String fileId, String annotationId);
+ List findByFileIdAndAnnotationId(String fileId, String annotationId);
- List findByFileId(String fileId);
+ List findByFileId(String fileId);
boolean existsByFileIdAndSoftDeletedTimeIsNull(String fileId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DigitalSignatureRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DigitalSignatureRepository.java
index 90491710c..58fab317e 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DigitalSignatureRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DigitalSignatureRepository.java
@@ -1,7 +1,7 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.DigitalSignature;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DigitalSignatureEntity;
import org.springframework.data.jpa.repository.JpaRepository;
-public interface DigitalSignatureRepository extends JpaRepository {
+public interface DigitalSignatureRepository extends JpaRepository {
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierAttributeConfigRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierAttributeConfigRepository.java
index f4e9167cf..a3f9bb3ee 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierAttributeConfigRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierAttributeConfigRepository.java
@@ -1,13 +1,13 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierAttributeConfig;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeConfigEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface DossierAttributeConfigRepository extends JpaRepository {
+public interface DossierAttributeConfigRepository extends JpaRepository {
- List findAllByDossierTemplateId(String dossierTemplateId);
+ List findAllByDossierTemplateId(String dossierTemplateId);
void deleteByDossierTemplateId(String dossierTemplateId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierAttributeRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierAttributeRepository.java
index d8bf074a2..ce0a45043 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierAttributeRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierAttributeRepository.java
@@ -1,22 +1,22 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierAttribute;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
-public interface DossierAttributeRepository extends JpaRepository {
+public interface DossierAttributeRepository extends JpaRepository {
- List findByIdDossierId(String dossierId);
+ List findByIdDossierId(String dossierId);
void deleteByDossierId(String dossierId);
- @Query("SELECT a FROM DossierAttribute a WHERE a.dossierAttributeConfig.dossierTemplate.id = :dossierTemplateId")
- List findByDossierTemplateId(String dossierTemplateId);
+ @Query("SELECT a FROM DossierAttributeEntity a WHERE a.dossierAttributeConfig.dossierTemplate.id = :dossierTemplateId")
+ List findByDossierTemplateId(String dossierTemplateId);
@Modifying
- @Query("DELETE FROM DossierAttribute e WHERE e.dossierAttributeConfig.id = :id")
+ @Query("DELETE FROM DossierAttributeEntity e WHERE e.dossierAttributeConfig.id = :id")
void deleteByDossierAttributeConfigId(String id);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierRepository.java
index 76279cbfd..6e9afc6fc 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierRepository.java
@@ -1,7 +1,7 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.Dossier;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
import org.springframework.data.jpa.repository.JpaRepository;
-public interface DossierRepository extends JpaRepository {
+public interface DossierRepository extends JpaRepository {
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java
index d588b63ea..b62c9b82e 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java
@@ -1,13 +1,13 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierTemplate;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
-public interface DossierTemplateRepository extends JpaRepository {
+public interface DossierTemplateRepository extends JpaRepository {
- @Query("select d from DossierTemplate d where d.deleted = false or d.deleted is null")
- List findAllWhereDeletedIsFalse();
+ @Query("select d from DossierTemplateEntity d where d.deleted = false or d.deleted is null")
+ List findAllWhereDeletedIsFalse();
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DownloadStatusRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DownloadStatusRepository.java
index 820e342e8..596f24505 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DownloadStatusRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DownloadStatusRepository.java
@@ -1,10 +1,10 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.download.DownloadStatus;
+import com.iqser.red.service.persistence.management.v1.processor.entity.download.DownloadStatusEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface DownloadStatusRepository extends JpaRepository {
- List findAllByUserId(String userId);
+public interface DownloadStatusRepository extends JpaRepository {
+ List findAllByUserId(String userId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/EntryRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/EntryRepository.java
index a848eadfc..458ccfc58 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/EntryRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/EntryRepository.java
@@ -1,17 +1,17 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.DictionaryEntry;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DictionaryEntryEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
-public interface EntryRepository extends JpaRepository {
+public interface EntryRepository extends JpaRepository {
void deleteAllByTypeIdAndVersionAndValueIn(String typeId, long version, List values);
- @Query("update DictionaryEntry e set e.version = :version where e.type.id =:typeId and e.value in :values")
+ @Query("update DictionaryEntryEntity e set e.version = :version where e.type.id =:typeId and e.value in :values")
void updateVersionWhereTypeIdAndValueIn(long version, String typeId, List values);
- List findByTypeId(String typeId);
+ List findByTypeId(String typeId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributeConfigRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributeConfigRepository.java
index b9c824f02..2a6b48407 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributeConfigRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributeConfigRepository.java
@@ -1,13 +1,12 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.FileAttributeConfig;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeConfigEntity;
import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
import java.util.List;
-public interface FileAttributeConfigRepository extends JpaRepository {
+public interface FileAttributeConfigRepository extends JpaRepository {
- List findByDossierTemplateId(String dossierTemplateId);
+ List findByDossierTemplateId(String dossierTemplateId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributesGeneralConfigurationRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributesGeneralConfigurationRepository.java
index 6d5774853..644cca7f9 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributesGeneralConfigurationRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributesGeneralConfigurationRepository.java
@@ -1,7 +1,7 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.FileAttributesGeneralConfiguration;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.FileAttributesGeneralConfigurationEntity;
import org.springframework.data.jpa.repository.JpaRepository;
-public interface FileAttributesGeneralConfigurationRepository extends JpaRepository {
+public interface FileAttributesGeneralConfigurationRepository extends JpaRepository {
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributesRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributesRepository.java
index 7e7a0ed0b..099d2146a 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributesRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileAttributesRepository.java
@@ -1,14 +1,14 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.FileAttribute;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
-public interface FileAttributesRepository extends JpaRepository {
+public interface FileAttributesRepository extends JpaRepository {
@Modifying
- @Query("DELETE FROM FileAttribute f where f.fileAttributeId.fileAttributeConfigId = :fileAttributeConfigId")
+ @Query("DELETE FROM FileAttributeEntity f where f.fileAttributeId.fileAttributeConfigId = :fileAttributeConfigId")
void deleteByFileAttributeConfigId(String fileAttributeConfigId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java
index 3624e27cc..ebb322fc6 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java
@@ -1,10 +1,11 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.File;
+
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface FileRepository extends JpaRepository {
- List findByDossierId(String dossierId);
+public interface FileRepository extends JpaRepository {
+ List findByDossierId(String dossierId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ForceRedactionRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ForceRedactionRepository.java
index 70e9d1caa..2175caaf7 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ForceRedactionRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ForceRedactionRepository.java
@@ -1,12 +1,12 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationId;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.ManualForceRedaction;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualForceRedactionEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface ForceRedactionRepository extends JpaRepository {
+public interface ForceRedactionRepository extends JpaRepository {
- List findByIdFileId(String fileId);
+ List findByIdFileId(String fileId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ImageRecategorizationRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ImageRecategorizationRepository.java
index eb27259b3..89700b921 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ImageRecategorizationRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ImageRecategorizationRepository.java
@@ -1,11 +1,11 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationId;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.ManualImageRecategorization;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualImageRecategorizationEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface ImageRecategorizationRepository extends JpaRepository {
- List findByIdFileId(String fileId);
+public interface ImageRecategorizationRepository extends JpaRepository {
+ List findByIdFileId(String fileId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisChangeRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisChangeRepository.java
index 8279b3335..08810acec 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisChangeRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisChangeRepository.java
@@ -1,12 +1,12 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationId;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualLegalBasisChangeEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface LegalBasisChangeRepository extends JpaRepository {
+public interface LegalBasisChangeRepository extends JpaRepository {
- List findByIdFileId(String fileId);
+ List findByIdFileId(String fileId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisMappingRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisMappingRepository.java
index 9d21949a5..f9d8018b2 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisMappingRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisMappingRepository.java
@@ -1,11 +1,9 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.LegalBasisMapping;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.LegalBasisMappingEntity;
import org.springframework.data.jpa.repository.JpaRepository;
-import java.util.List;
-
-public interface LegalBasisMappingRepository extends JpaRepository {
+public interface LegalBasisMappingRepository extends JpaRepository {
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ManualRedactionRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ManualRedactionRepository.java
index c72979694..e694a18f6 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ManualRedactionRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ManualRedactionRepository.java
@@ -1,12 +1,12 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationId;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.ManualRedactionEntry;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualRedactionEntryEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface ManualRedactionRepository extends JpaRepository {
+public interface ManualRedactionRepository extends JpaRepository {
- List findByIdFileId(String fileId);
+ List findByIdFileId(String fileId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/NotificationRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/NotificationRepository.java
index 8301c36f4..768863b8a 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/NotificationRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/NotificationRepository.java
@@ -1,21 +1,21 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.notification.Notification;
+import com.iqser.red.service.persistence.management.v1.processor.entity.notification.NotificationEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
import java.util.Optional;
-public interface NotificationRepository extends JpaRepository {
+public interface NotificationRepository extends JpaRepository {
- List findByUserIdOrderByCreationDateDesc(String userId);
+ List findByUserIdOrderByCreationDateDesc(String userId);
- @Query("Select n from Notification n where n.softDeleted is null and n.userId = :userId order by n.creationDate desc")
- List findForUser(String userId);
+ @Query("Select n from NotificationEntity n where n.softDeleted is null and n.userId = :userId order by n.creationDate desc")
+ List findForUser(String userId);
- @Query("Select n from Notification n where n.seenDate is null and n.softDeleted is null and n.userId = :userId order by n.creationDate desc")
- List findNotSeenForUser(String userId);
+ @Query("Select n from NotificationEntity n where n.seenDate is null and n.softDeleted is null and n.userId = :userId order by n.creationDate desc")
+ List findNotSeenForUser(String userId);
- Optional findByIdAndUserId(long notificationId, String userId);
+ Optional findByIdAndUserId(long notificationId, String userId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RemoveRedactionRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RemoveRedactionRepository.java
index c67c7d6bd..10ad17407 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RemoveRedactionRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RemoveRedactionRepository.java
@@ -1,12 +1,12 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.AnnotationId;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.IdRemoval;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.IdRemovalEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface RemoveRedactionRepository extends JpaRepository {
+public interface RemoveRedactionRepository extends JpaRepository {
- List findByIdFileId(String fileId);
+ List findByIdFileId(String fileId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ReportTemplateRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ReportTemplateRepository.java
index 3d58d7d88..472c49015 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ReportTemplateRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ReportTemplateRepository.java
@@ -1,10 +1,10 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.ReportTemplate;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.ReportTemplateEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface ReportTemplateRepository extends JpaRepository {
- List findAllByDossierTemplateId(String dossierTemplateId);
+public interface ReportTemplateRepository extends JpaRepository {
+ List findAllByDossierTemplateId(String dossierTemplateId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RuleSetRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RuleSetRepository.java
index b335cc427..be5427c03 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RuleSetRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RuleSetRepository.java
@@ -1,8 +1,8 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.RuleSet;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.RuleSetEntity;
import org.springframework.data.jpa.repository.JpaRepository;
-public interface RuleSetRepository extends JpaRepository {
+public interface RuleSetRepository extends JpaRepository {
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/SMTPRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/SMTPRepository.java
index 494f0d287..d2b177167 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/SMTPRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/SMTPRepository.java
@@ -1,7 +1,7 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.SMTPConfiguration;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.SMTPConfigurationEntity;
import org.springframework.data.jpa.repository.JpaRepository;
-public interface SMTPRepository extends JpaRepository {
+public interface SMTPRepository extends JpaRepository {
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/TypeRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/TypeRepository.java
index 57da87630..2766d4a73 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/TypeRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/TypeRepository.java
@@ -1,25 +1,24 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Type;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.Dossier;
-import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierTemplate;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
-import javax.transaction.Transactional;
import java.util.List;
import java.util.Optional;
-public interface TypeRepository extends JpaRepository {
+public interface TypeRepository extends JpaRepository {
- Optional findOneByDossierTemplateAndDossierAndRank(DossierTemplate dossierTemplate, Dossier dossier, int rank);
+ Optional findOneByDossierTemplateAndDossierAndRank(DossierTemplateEntity dossierTemplate, DossierEntity dossier, int rank);
- List findByDossierTemplateId(String dossierTemplateId);
+ List findByDossierTemplateId(String dossierTemplateId);
- List findByDossierId(String dossierId);
+ List findByDossierId(String dossierId);
@Modifying
- @Query("update Type t set t.version = t.version +1 where t.id = :typeId")
+ @Query("update TypeEntity t set t.version = t.version +1 where t.id = :typeId")
void updateByIdSetIncrementVersionByOne(String typeId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ViewedPagesRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ViewedPagesRepository.java
index 633ed60aa..b08d9defc 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ViewedPagesRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ViewedPagesRepository.java
@@ -1,14 +1,14 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.ViewedPage;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ViewedPageEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
-public interface ViewedPagesRepository extends JpaRepository {
+public interface ViewedPagesRepository extends JpaRepository {
void deleteByFileId(String fileId);
- List findByFileIdAndIdUserId(String fileId, String userId);
+ List findByFileIdAndIdUserId(String fileId, String userId);
}
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/WatermarkRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/WatermarkRepository.java
index 1b6453e14..adf8a9f6b 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/WatermarkRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/WatermarkRepository.java
@@ -1,7 +1,7 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Watermark;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.WatermarkEntity;
import org.springframework.data.jpa.repository.JpaRepository;
-public interface WatermarkRepository extends JpaRepository {
+public interface WatermarkRepository extends JpaRepository {
}
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/AuditController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/AuditController.java
index 703e98cbb..8dd72d467 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/AuditController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/AuditController.java
@@ -1,10 +1,10 @@
package com.iqser.red.service.peristence.v1.server.controller;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
-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 com.iqser.red.service.persistence.management.v1.processor.entity.audit.AuditEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.audit.AuditRequest;
+import com.iqser.red.service.persistence.management.v1.processor.entity.audit.AuditSearchRequest;
+import com.iqser.red.service.persistence.management.v1.processor.entity.audit.CategoryModel;
import com.iqser.red.service.persistence.service.v1.api.resources.AuditResource;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
@@ -25,7 +25,7 @@ public class AuditController implements AuditResource {
}
@Override
- public Page search(@RequestBody AuditSearchRequest auditSearchRequest) {
+ public Page search(@RequestBody AuditSearchRequest auditSearchRequest) {
return auditPersistenceService.search(auditSearchRequest);
}
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
index f746f77d3..c929e001c 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
@@ -7,9 +7,9 @@ import com.iqser.red.service.persistence.management.v1.processor.exception.Confl
import com.iqser.red.service.persistence.management.v1.processor.service.ColorsService;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DictionaryPersistenceService;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.EntryPersistenceService;
-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.management.v1.processor.entity.configuration.ColorsEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DictionaryEntryEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
import com.iqser.red.service.persistence.service.v1.api.resources.DictionaryResource;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -50,7 +50,7 @@ public class DictionaryController implements DictionaryResource {
validateEntries(cleanEntries);
// To check whether the type exists, type should not be added into database implicitly by addEntry.
- Type typeResult = dictionaryPersistenceService.getType(typeId);
+ TypeEntity typeResult = dictionaryPersistenceService.getType(typeId);
// List entriesToSearch = new ArrayList<>();
@@ -59,7 +59,7 @@ public class DictionaryController implements DictionaryResource {
List existing = entryPersistenceService.getEntries(typeId)
.stream()
.filter(e -> !e.isDeleted())
- .map(DictionaryEntry::getValue)
+ .map(DictionaryEntryEntity::getValue)
.collect(toList());
List removed = new ArrayList<>(existing);
@@ -88,13 +88,13 @@ public class DictionaryController implements DictionaryResource {
validateEntries(entries);
// To check whether the type exists
- Type typeResult = dictionaryPersistenceService.getType(typeId);
+ TypeEntity typeResult = dictionaryPersistenceService.getType(typeId);
long currentVersion = typeResult.getVersion();
if (typeResult.isCaseInsensitive()) {
List existing = entryPersistenceService.getEntries(typeId)
.stream()
- .map(DictionaryEntry::getValue)
+ .map(DictionaryEntryEntity::getValue)
.collect(toList());
entryPersistenceService.deleteEntries(typeId, existing.stream()
.filter(e -> entries.stream().anyMatch(e::equalsIgnoreCase))
@@ -109,13 +109,13 @@ public class DictionaryController implements DictionaryResource {
@Override
public void updateTypeValue(@PathVariable(TYPE_PARAMETER_NAME) String typeId,
- @RequestBody Type typeValueRequest) {
+ @RequestBody TypeEntity typeValueRequest) {
validateColor(typeValueRequest.getHexColor());
validateBoolean(typeValueRequest.isHint(), "isHint");
validateBoolean(typeValueRequest.isCaseInsensitive(), "isCaseInsensitive");
// To check whether the type exists
- Type typeResult = dictionaryPersistenceService.getType(typeId);
+ TypeEntity typeResult = dictionaryPersistenceService.getType(typeId);
if (typeValueRequest.getLabel() != null) {
@@ -131,10 +131,10 @@ public class DictionaryController implements DictionaryResource {
if (typeResult.isHint() != typeValueRequest.isHint() || typeResult.isCaseInsensitive() != typeValueRequest.isCaseInsensitive() || typeResult
.getRank() != typeValueRequest.getRank()) {
long currentVersion = typeResult.getVersion();
- List entries = entryPersistenceService.getEntries(typeId);
+ List entries = entryPersistenceService.getEntries(typeId);
entryPersistenceService.setVersion(typeId, entries.stream()
.filter(entry -> !entry.isDeleted())
- .map(DictionaryEntry::getValue)
+ .map(DictionaryEntryEntity::getValue)
.collect(toList()), currentVersion + 1);
}
@@ -143,7 +143,7 @@ public class DictionaryController implements DictionaryResource {
@Override
- public Type addType(@RequestBody Type typeRequest) {
+ public TypeEntity addType(@RequestBody TypeEntity typeRequest) {
if (typeRequest.getDossierTemplateId() == null) {
throw new BadRequestException("Dossier template id does not exist.");
@@ -173,13 +173,13 @@ public class DictionaryController implements DictionaryResource {
public void deleteType(@PathVariable(TYPE_PARAMETER_NAME) String typeId) {
// NotFoundException would be thrown if the type not found in database.
- Type typeResult = dictionaryPersistenceService.getType(typeId);
+ TypeEntity typeResult = dictionaryPersistenceService.getType(typeId);
long currentVersion = typeResult.getVersion();
dictionaryPersistenceService.deleteType(typeId);
List existing = entryPersistenceService.getEntries(typeId)
.stream()
- .map(DictionaryEntry::getValue)
+ .map(DictionaryEntryEntity::getValue)
.collect(toList());
entryPersistenceService.deleteEntries(typeId, existing, currentVersion + 1);
@@ -188,25 +188,25 @@ public class DictionaryController implements DictionaryResource {
@Override
- public List