Fixed changelog and tests

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<DossierAttributeEntity> dossierAttributes = new ArrayList<>();
 
-    @JsonIgnore
     @ManyToOne(fetch = FetchType.LAZY)
     private DossierStatusEntity dossierStatus;
 

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)
+    @OneToMany(mappedBy = "dossierStatus")
-//    @JsonIgnore
+    private List<DossierEntity> dossiers = new ArrayList<>();
-//    @OneToMany(mappedBy = "dossierStatus")
-//    private List<DossierEntity> dossiers = new ArrayList<>();
 }

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

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'

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
+      id: 1643616110560-1
-    author: generated
+      author: corina (generated)
-    changes:
+      changes:
-      - createTable:
+        - createTable:
-          columns:
+            columns:
-            - column:
+              - column:
-                constraints:
+                  constraints:
-                  nullable: false
+                    nullable: false
-                  primaryKey: true
+                    primaryKey: true
-                  primaryKeyName: dossier_status_pkey
+                    primaryKeyName: dossier_status_pkey
-                name: id
+                  name: id
-                type: VARCHAR(255)
+                  type: VARCHAR(255)
-            - column:
+              - column:
-                name: name
+                  name: description
-                type: VARCHAR(255)
+                  type: VARCHAR(255)
-            - column:
+              - column:
-                name: descriptiom
+                  name: dossier_template_id
-                type: VARCHAR(255)
+                  type: VARCHAR(255)
-            - column:
+              - column:
-                name: dossier_template_id
+                  name: name
-                type: VARCHAR(255)
+                  type: VARCHAR(255)
-          tableName: dossier_status
+            tableName: dossier_status
   - changeSet:
-          id: dossier-status-2
+      id: 1643616110560-4
-          author:
+      author: corina (generated)
-          changes:
+      changes:
-            - addColumn:
+        - addColumn:
-                columns:
+            columns:
-                  - column:
+              - column:
-                      name: dossier_status_id
+                  name: dossier_status_id
-                      type: VARCHAR(255)
+                  type: VARCHAR(255)
-                tableName: dossier
+            tableName: dossier
   - changeSet:
-      id: dossier-status-3
+      id: 1643616110560-2
-      author: generated
+      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
+      id: 1643616110560-3
-    author: generated
+      author: corina (generated)
-    changes:
+      changes:
-      - addForeignKeyConstraint:
+        - addForeignKeyConstraint:
-          baseColumnNames: dossier_status_id
+            baseColumnNames: dossier_status_id
-          baseTableName: dossier
+            baseTableName: dossier
-          constraintName: dossier_dossier_status
+            constraintName: fknssxyrv28hjvshbrvb4wm9hbn
-          deferrable: false
+            deferrable: false
-          initiallyDeferred: false
+            initiallyDeferred: false
-          onDelete: NO ACTION
+            onDelete: NO ACTION
-          onUpdate: NO ACTION
+            onUpdate: NO ACTION
-          referencedColumnNames: id
+            referencedColumnNames: id
-          referencedTableName: dossier_status
+            referencedTableName: dossier_status
-          validate: true
+            validate: true

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();