From 513501abf476dc7f08446bb3035da888d2fd30a2 Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Fri, 14 May 2021 15:00:22 +0300
Subject: [PATCH] save legal basis version on redaction log

---
 .../redaction-service-api-v1/pom.xml          |  8 +++++++-
 .../redaction/v1/model/RedactionLog.java      | 20 +++++--------------
 .../redaction-service-server-v1/pom.xml       |  9 ++++-----
 .../redaction/service/ReanalyzeService.java   |  9 ++++++---
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/redaction-service-v1/redaction-service-api-v1/pom.xml b/redaction-service-v1/redaction-service-api-v1/pom.xml
index 42f3ed40..cb0d850a 100644
--- a/redaction-service-v1/redaction-service-api-v1/pom.xml
+++ b/redaction-service-v1/redaction-service-api-v1/pom.xml
@@ -20,7 +20,13 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>configuration-service-api-v1</artifactId>
-            <version>2.5.6</version>
+            <version>2.7.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>file-management-service-api-v1</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>
diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLog.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLog.java
index d8f3bfd6..9c28f5fc 100644
--- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLog.java
+++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLog.java
@@ -1,37 +1,27 @@
 package com.iqser.red.service.redaction.v1.model;
 
 import com.iqser.red.service.configuration.v1.api.model.LegalBasisMapping;
+import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Data
-@NoArgsConstructor
+@AllArgsConstructor
 public class RedactionLog {
 
     private List<RedactionLogEntry> redactionLogEntry;
-
     private List<LegalBasisMapping> legalBasis;
-    private long dictionaryVersion = -1;
-    private long rulesVersion = -1;
 
     private String ruleSetId;
 
+    private long dictionaryVersion = -1;
+    private long rulesVersion = -1;
     private long dossierDictionaryVersion = -1;
+    private long legalBasisVersion = -1;
 
 
-    public RedactionLog(List<RedactionLogEntry> redactionLogEntry,
-                        List<LegalBasisMapping> legalBasis,
-                        long dictionaryVersion, long rulesVersion, String ruleSetId, long dossierDictionaryVersion) {
 
-        this.redactionLogEntry = redactionLogEntry;
-        this.legalBasis = legalBasis;
-        this.dictionaryVersion = dictionaryVersion;
-        this.rulesVersion = rulesVersion;
-        this.ruleSetId = ruleSetId;
-        this.dossierDictionaryVersion = dossierDictionaryVersion;
-    }
 
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/pom.xml b/redaction-service-v1/redaction-service-server-v1/pom.xml
index 1975a136..ddb9b436 100644
--- a/redaction-service-v1/redaction-service-server-v1/pom.xml
+++ b/redaction-service-v1/redaction-service-server-v1/pom.xml
@@ -21,11 +21,6 @@
             <artifactId>redaction-service-api-v1</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>configuration-service-api-v1</artifactId>
-            <version>2.5.6</version>
-        </dependency>
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>file-management-service-api-v1</artifactId>
@@ -35,6 +30,10 @@
                     <groupId>com.iqser.red.service</groupId>
                     <artifactId>redaction-service-api-v1</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>configuration-service-api-v1</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java
index 12c10b7e..511d689e 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java
@@ -66,9 +66,12 @@ public class ReanalyzeService {
         log.info("Redaction analysis successful...");
 
         var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getRuleSetId());
-        var redactionLog = new RedactionLog(classifiedDoc.getRedactionLogEntities(),legalBasis, classifiedDoc.getDictionaryVersion()
-                .getRulesetVersion(), classifiedDoc.getRulesVersion(), analyzeRequest.getRuleSetId(), classifiedDoc.getDictionaryVersion()
-                .getDossierVersion());
+        var redactionLog = new RedactionLog(classifiedDoc.getRedactionLogEntities(),legalBasis,
+                analyzeRequest.getRuleSetId(),
+                classifiedDoc.getDictionaryVersion().getRulesetVersion(),
+                classifiedDoc.getRulesVersion(),
+                classifiedDoc.getDictionaryVersion().getDossierVersion(),
+                legalBasisClient.getVersion(analyzeRequest.getRuleSetId()));
 
         log.info("Analyzed with rules {} and dictionary {} for ruleSet: {}", classifiedDoc.getRulesVersion(), classifiedDoc
                 .getDictionaryVersion(), analyzeRequest.getRuleSetId());