diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierEntity.java index 6b5c50971..b13273cab 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierEntity.java @@ -98,7 +98,6 @@ public class DossierEntity { @OneToMany(cascade = CascadeType.ALL, mappedBy = "dossier") private List dossierAttributes = new ArrayList<>(); - @JsonIgnore @ManyToOne(fetch = FetchType.LAZY) private DossierStatusEntity dossierStatus; diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierStatusEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierStatusEntity.java index 9193f23b7..bf748095c 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierStatusEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierStatusEntity.java @@ -1,6 +1,5 @@ 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; @@ -26,16 +25,14 @@ public class DossierStatusEntity { @Column private String description; - // un dossierTemplate, ( dossierTemplate are o lista de DossierStatus -> one to many ) - @JsonIgnore + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "dossier_template_id") private DossierTemplateEntity dossierTemplate; @Column(updatable = false, insertable = false, name = "dossier_template_id") private String dossierTemplateId; -//// si o lista de dossiers care sunt in acest status ( 0..n) -// @JsonIgnore -// @OneToMany(mappedBy = "dossierStatus") -// private List dossiers = new ArrayList<>(); + @OneToMany(mappedBy = "dossierStatus") + private List dossiers = new ArrayList<>(); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/test/resources/application.yml b/persistence-service-v1/persistence-service-processor-v1/src/test/resources/application.yml index be5849a82..e69de29bb 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/test/resources/application.yml +++ b/persistence-service-v1/persistence-service-processor-v1/src/test/resources/application.yml @@ -1,10 +0,0 @@ -cassandra: - keyspace-name: file_management_service - migrations-location: 'classpath:cassandra/migrations/*.cql' - - -spring: - test: - context: - cache: - maxSize: 60 \ No newline at end of file diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml index 5570b2b13..e96efe5fd 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml @@ -52,11 +52,6 @@ management: metrics.export.prometheus.enabled: ${monitoring.enabled:false} -cassandra: - keyspace-name: file_management_service - migrations-location: 'classpath:cassandra/migrations/*.cql' - - storage: signer-type: 'AWSS3V4SignerType' bucket-name: 'redaction' diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/7-dossier-status-table.changelog.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/7-dossier-status-table.changelog.yaml index 6b31a05be..6e9a8a535 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/7-dossier-status-table.changelog.yaml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/7-dossier-status-table.changelog.yaml @@ -1,45 +1,45 @@ databaseChangeLog: - changeSet: - id: dossier-status-1 - author: generated - changes: - - createTable: - columns: - - column: - constraints: - nullable: false - primaryKey: true - primaryKeyName: dossier_status_pkey - name: id - type: VARCHAR(255) - - column: - name: name - type: VARCHAR(255) - - column: - name: descriptiom - type: VARCHAR(255) - - column: - name: dossier_template_id - type: VARCHAR(255) - tableName: dossier_status + id: 1643616110560-1 + author: corina (generated) + changes: + - createTable: + columns: + - column: + constraints: + nullable: false + primaryKey: true + primaryKeyName: dossier_status_pkey + name: id + type: VARCHAR(255) + - column: + name: description + type: VARCHAR(255) + - column: + name: dossier_template_id + type: VARCHAR(255) + - column: + name: name + type: VARCHAR(255) + tableName: dossier_status - changeSet: - id: dossier-status-2 - author: - changes: - - addColumn: - columns: - - column: - name: dossier_status_id - type: VARCHAR(255) - tableName: dossier + id: 1643616110560-4 + author: corina (generated) + changes: + - addColumn: + columns: + - column: + name: dossier_status_id + type: VARCHAR(255) + tableName: dossier - changeSet: - id: dossier-status-3 - author: generated + id: 1643616110560-2 + author: corina (generated) changes: - addForeignKeyConstraint: baseColumnNames: dossier_template_id baseTableName: dossier_status - constraintName: dossier_status_dossier_template_id + constraintName: fk6ao9oeuqkx147xofcjt17c1vx deferrable: false initiallyDeferred: false onDelete: NO ACTION @@ -48,17 +48,17 @@ databaseChangeLog: referencedTableName: dossier_template validate: true - changeSet: - id: dossier-status-4 - author: generated - changes: - - addForeignKeyConstraint: - baseColumnNames: dossier_status_id - baseTableName: dossier - constraintName: dossier_dossier_status - deferrable: false - initiallyDeferred: false - onDelete: NO ACTION - onUpdate: NO ACTION - referencedColumnNames: id - referencedTableName: dossier_status - validate: true \ No newline at end of file + id: 1643616110560-3 + author: corina (generated) + changes: + - addForeignKeyConstraint: + baseColumnNames: dossier_status_id + baseTableName: dossier + constraintName: fknssxyrv28hjvshbrvb4wm9hbn + deferrable: false + initiallyDeferred: false + onDelete: NO ACTION + onUpdate: NO ACTION + referencedColumnNames: id + referencedTableName: dossier_status + validate: true diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java index 4dd8cd27f..7a94ebabd 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java @@ -108,6 +108,8 @@ public abstract class AbstractPersistenceServerServiceTest { private DossierAttributeConfigRepository dossierAttributeConfigRepository; @Autowired private NotificationPreferencesRepository notificationPreferencesRepository; + @Autowired + private DossierStatusRepository dossierStatusRepository; @Before public void setupOptimize() { @@ -166,6 +168,7 @@ public abstract class AbstractPersistenceServerServiceTest { ruleSetRepository.deleteAll(); smtpRepository.deleteAll(); fileRepository.deleteAll(); + dossierStatusRepository.deleteAll(); dossierRepository.deleteAll(); dossierTemplateRepository.deleteAll(); notificationPreferencesRepository.deleteAll();