finarkein · primarypi · Apr 19, 2022 · Aug 29, 2021 · Sep 4, 2021 · Sep 7, 2021
diff --git a/fiul-aa-webclient/pom.xml b/fiul-aa-webclient/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-core/pom.xml b/fiul-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-core/src/main/java/io/finarkein/fiul/consent/ConsentState.java b/fiul-core/src/main/java/io/finarkein/fiul/consent/ConsentState.java
@@ -8,7 +8,6 @@
 
 import java.util.Arrays;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -29,17 +28,6 @@ public enum ConsentState {
                 .collect(Collectors.toMap(Enum::name, Function.identity()));
     }
 
-    public static final Set<ConsentState> CONSENT_NEGATIVE_STATUS = Set.of(PAUSED, EXPIRED, REVOKED);
-    public static final Set<ConsentState> CONSENT_CLEANUP_STATUS = Set.of(REJECTED, EXPIRED, REVOKED);
-
-    public boolean isNegativeStatus() {
-        return CONSENT_NEGATIVE_STATUS.contains(this);
-    }
-
-    public boolean isCleanupStatus() {
-        return CONSENT_CLEANUP_STATUS.contains(this);
-    }
-
     public static ConsentState get(String stateValue) {
         final var consentState = lookup.get(stateValue);
         if (consentState != null)

diff --git a/fiul-rest/fiul-rest-app/pom.xml b/fiul-rest/fiul-rest-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul-rest</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-rest/fiul-rest-app/src/main/resources/application.properties b/fiul-rest/fiul-rest-app/src/main/resources/application.properties
@@ -8,6 +8,8 @@ spring.cloud.config.enabled=false
 fiul.entity_id=fiu@id
 fiul.dataflow.data-life-tracker-fixed-delay=600000
 fiul.dataflow.fi-data-crypto-service=${FI_DATA_CRYPTO_SERVICE:no-op}
+# set of consent states for which data clean up required
+fiul.dataflow.data-cleanup-consent-states=REVOKED
 ## Start: notification config #################################################
 fiul.notification.jws-filter-qualifier=fiul
 fiul.notification-queue-type=in-mem

diff --git a/fiul-rest/fiul-rest-consent/pom.xml b/fiul-rest/fiul-rest-consent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul-rest</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-rest/fiul-rest-dataflow/pom.xml b/fiul-rest/fiul-rest-dataflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul-rest</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-rest/fiul-rest-notification/pom.xml b/fiul-rest/fiul-rest-notification/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul-rest</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-rest/pom.xml b/fiul-rest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.finarkein.fiu</groupId>
         <artifactId>fiul</artifactId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/fiul-service-consent/pom.xml b/fiul-service-consent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-dataflow/fiul-dataflow-core/pom.xml b/fiul-service-dataflow/fiul-dataflow-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.finarkein.fiu</groupId>
         <artifactId>fiul-service-dataflow</artifactId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...w-core/src/main/java/io/finarkein/fiul/dataflow/impl/DataFlowNotificationHandlerImpl.java b/...w-core/src/main/java/io/finarkein/fiul/dataflow/impl/DataFlowNotificationHandlerImpl.java
@@ -15,20 +15,26 @@
 import io.finarkein.fiul.dataflow.store.FIRequestStore;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.Set;
+
 @Service
 @Log4j2
 public class DataFlowNotificationHandlerImpl implements DataFlowNotificationHandler {
 
     @Autowired
-    DataFlowService dataFlowService;
+    private DataFlowService dataFlowService;
 
     @Autowired
-    EasyDataFlowService easyDataFlowService;
+    private EasyDataFlowService easyDataFlowService;
 
     @Autowired
-    FIRequestStore fiRequestStore;
+    private FIRequestStore fiRequestStore;
+
+    @Value("${fiul.dataflow.data-cleanup-consent-states}")
+    private Set<String> dataCleanupConsentStates;
 
     @Override
     public void handleFINotification(FINotification fiNotification) {
@@ -41,13 +47,16 @@ public void handleConsentNotification(ConsentNotification consentNotification) {
         final var consentStatus = statusNotification.getConsentStatus();
         final var consentState = ConsentState.get(consentStatus.toUpperCase());
 
-        if (!consentState.isCleanupStatus())
-            return;
-
         log.debug("Handling consentNotification:{}", consentNotification);
-        if (consentState == ConsentState.REVOKED || consentState == ConsentState.EXPIRED) {
+        if (isCleanupRequired(consentState)) {
             easyDataFlowService.deleteData(statusNotification.getConsentId());
             dataFlowService.deleteDataByConsentId(statusNotification.getConsentId());
+            log.debug("Data cleanup done for consentNotification:{}", consentNotification);
         }
     }
+
+    private boolean isCleanupRequired(ConsentState forConsentState){
+        return dataCleanupConsentStates.contains(forConsentState.name())
+                || dataCleanupConsentStates.contains(forConsentState.name().toLowerCase());
+    }
 }
diff --git a/fiul-service-dataflow/fiul-dataflow-default-impl/pom.xml b/fiul-service-dataflow/fiul-dataflow-default-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.finarkein.fiu</groupId>
         <artifactId>fiul-service-dataflow</artifactId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-dataflow/fiul-dataflow-fi-data-crypto-no-op/pom.xml b/fiul-service-dataflow/fiul-dataflow-fi-data-crypto-no-op/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.finarkein.fiu</groupId>
         <artifactId>fiul-service-dataflow</artifactId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-dataflow/fiul-dataflow-notification-subscriber/pom.xml b/fiul-service-dataflow/fiul-dataflow-notification-subscriber/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.finarkein.fiu</groupId>
         <artifactId>fiul-service-dataflow</artifactId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-dataflow/pom.xml b/fiul-service-dataflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-notification/fiul-notification-callback-core/pom.xml b/fiul-service-notification/fiul-notification-callback-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.finarkein.fiu</groupId>
         <artifactId>fiul-service-notification</artifactId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-notification/fiul-notification-callbacks-in-mem-sub/pom.xml b/fiul-service-notification/fiul-notification-callbacks-in-mem-sub/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.finarkein.fiu</groupId>
         <artifactId>fiul-service-notification</artifactId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-notification/fiul-notification-callbacks-jpa/pom.xml b/fiul-service-notification/fiul-notification-callbacks-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.finarkein.fiu</groupId>
         <artifactId>fiul-service-notification</artifactId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-notification/fiul-notification-core/pom.xml b/fiul-service-notification/fiul-notification-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.finarkein.fiu</groupId>
         <artifactId>fiul-service-notification</artifactId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-notification/fiul-notification-in-mem-config/pom.xml b/fiul-service-notification/fiul-notification-in-mem-config/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul-service-notification</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-notification/fiul-notification-in-mem-pub/pom.xml b/fiul-service-notification/fiul-notification-in-mem-pub/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul-service-notification</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fiul-service-notification/pom.xml b/fiul-service-notification/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiul</artifactId>
         <groupId>io.finarkein.fiu</groupId>
-        <version>0.6.5</version>
+        <version>0.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>io.finarkein.fiu</groupId>
     <artifactId>fiul</artifactId>
-    <version>0.6.5</version>
+    <version>0.6.6</version>
     <packaging>pom</packaging>
 
     <name>fiul</name>