From 310e526b69ce6b46c9fcf26dd1bfa53079255fd6 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 14 Sep 2021 14:24:27 +0300 Subject: [PATCH] persistence service starts - finally with sql --- .dev/docker-compose.yaml | 17 ++++++++++++++++ .../api/model/data/annotations/Comment.java | 2 ++ .../api/model/data/annotations/IdRemoval.java | 6 +++--- .../annotations/ManualForceRedaction.java | 6 +++--- .../ManualImageRecategorization.java | 6 +++--- .../annotations/ManualLegalBasisChange.java | 6 +++--- .../FileAttributesGeneralConfiguration.java | 9 +++++---- .../model/data/configuration/Watermark.java | 2 +- .../v1/api/model/DigitalSignatureModel.java | 20 +++++++++++++++++++ .../CommentPersistenceService.java | 2 +- .../repository/CommentRepository.java | 3 ++- .../v1/server/client/SearchClient.java | 2 +- .../src/main/resources/application-dev.yml | 7 +------ 13 files changed, 62 insertions(+), 26 deletions(-) create mode 100644 .dev/docker-compose.yaml create mode 100644 persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/configuration/v1/api/model/DigitalSignatureModel.java diff --git a/.dev/docker-compose.yaml b/.dev/docker-compose.yaml new file mode 100644 index 000000000..7c41d0e69 --- /dev/null +++ b/.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 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-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Comment.java index 797c4ecd9..2d5de7dd4 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-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 { 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-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/IdRemoval.java index 1c88157ae..50127ceab 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-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 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-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualForceRedaction.java index 554f68d38..12705f179 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-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 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-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualImageRecategorization.java index b66ce84d1..e4df796f8 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-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 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-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualLegalBasisChange.java index 266408ed3..19d6ed5c7 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-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 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-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/FileAttributesGeneralConfiguration.java index 8d086de15..69f9df3b3 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-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; } 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-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Watermark.java index 50389ceff..650a3cc6c 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-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 { 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 new file mode 100644 index 000000000..58a3ee655 --- /dev/null +++ b/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; +} 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 415bcbe7e..e476d2a65 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 @@ -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) { 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 9a5f98671..c98842611 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 @@ -6,9 +6,10 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; public interface CommentRepository extends JpaRepository { + List findByFileIdAndAnnotationId(String fileId, String annotationId); List findByFileId(String fileId); - boolean existsByFileIdAAndSoftDeletedTimeIsNull(String fileId); + boolean existsByFileIdAndSoftDeletedTimeIsNull(String fileId); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/SearchClient.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/SearchClient.java index e4d22914c..3ef3ac738 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/SearchClient.java +++ b/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 { } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml index 74de30427..2bfd1b203 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml +++ b/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'