persistence service starts - finally with sql

.dev/docker-compose.yaml

@@ -0,0 +1,17 @@
+version: '2'
+
+services:
+  rabbitmq:
+    image: 'bitnami/rabbitmq:latest'
+    mem_limit: 1000m
+    environment:
+      - RABBITMQ_PASSWORD=rabbitmq
+    ports:
+      - 5672:5672
+      - 15672:15672
+  minio:
+    mem_limit: 1000m
+    image: minio/minio
+    command: server /data
+    ports:
+      - 9000:9000

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

@@ -11,6 +11,8 @@ import java.time.OffsetDateTime;
 
 @Data
 @Builder
+@Entity
+@Table(name = "comment")
 @AllArgsConstructor
 @NoArgsConstructor
 public class Comment {

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

@@ -6,11 +6,11 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 import java.time.OffsetDateTime;
 
+@Entity
+@Table(name = "id_removal")
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -6,15 +6,15 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 import java.time.OffsetDateTime;
 
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
+@Entity
+@Table(name = "manual_force_redaction")
 public class ManualForceRedaction {
 
     @EmbeddedId

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

@@ -6,15 +6,15 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 import java.time.OffsetDateTime;
 
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
+@Entity
+@Table(name = "manual_image_recategorization")
 public class ManualImageRecategorization {
 
     @EmbeddedId

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

@@ -6,15 +6,15 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 import java.time.OffsetDateTime;
 
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
+@Entity
+@Table(name = "manual_legal_basis_change")
 public class ManualLegalBasisChange {
 
     @EmbeddedId

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

@@ -5,17 +5,17 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
+import javax.persistence.*;
 
 @Data
+@Entity
+@Table(name = "file_attribute_general_configuration")
 @NoArgsConstructor
 @AllArgsConstructor
 public class FileAttributesGeneralConfiguration {
 
     @Id
-    @Column
+    @Column(name = "dossier_template_id")
     private String dossierTemplateId;
     @Column
     private String filenameMappingColumnHeaderName;
@@ -23,6 +23,7 @@ public class FileAttributesGeneralConfiguration {
     private String delimiter;
 
     @OneToOne
+    @MapsId("dossierTemplateId")
     private DossierTemplate dossierTemplate;
 
 }

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

@@ -9,7 +9,7 @@ import javax.persistence.*;
 
 @Data
 @Entity
-@Table(name = "watermark_config")
+@Table(name = "watermark_configuration")
 @NoArgsConstructor
 @AllArgsConstructor
 public class Watermark {

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

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

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

@@ -43,7 +43,7 @@ public class CommentPersistenceService {
     }
 
     public boolean fileHasComments(String fileId) {
-        return commentRepository.existsByFileIdAAndSoftDeletedTimeIsNull(fileId);
+        return commentRepository.existsByFileIdAndSoftDeletedTimeIsNull(fileId);
     }
 
     public void hardDelete(long commentId) {

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

@@ -6,9 +6,10 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.List;
 
 public interface CommentRepository extends JpaRepository<Comment, Long> {
+
     List<Comment> findByFileIdAndAnnotationId(String fileId, String annotationId);
 
     List<Comment> findByFileId(String fileId);
 
-    boolean existsByFileIdAAndSoftDeletedTimeIsNull(String fileId);
+    boolean existsByFileIdAndSoftDeletedTimeIsNull(String fileId);
 }

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/SearchClient.java

@@ -4,7 +4,7 @@ import com.iqser.red.service.search.v1.resources.SearchResource;
 import org.springframework.cloud.openfeign.FeignClient;
 
 
-@FeignClient(name = "SearchResource", url = "${search-service-service.url}")
+@FeignClient(name = "SearchResource", url = "${search-service.url}")
 public interface SearchClient extends SearchResource {
 
 }

persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml

@@ -5,12 +5,7 @@ redaction-service.url: "http://localhost:8083"
 configuration-service.url: "http://localhost:8081"
 pdftron-redaction-service.url: "http://localhost:8086"
 redaction-report-service.url: "http://localhost:8084"
-
-cassandra:
-  servers: 127.0.0.1
-  role-name: cassandra
-  password: cassandra
-
+search-service.url: "http://localhost:8088"
 
 storage:
   bucket-name: 'redaction'