feat: finalized dpp-verification backend

eclipse-tractusx · Jun 21, 2024 · 4eda84c · 4eda84c
1 parent 5816453
commit 4eda84c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/...ain/java/org/eclipse/tractusx/digitalproductpass/core/http/controllers/AppController.java b/...ain/java/org/eclipse/tractusx/digitalproductpass/core/http/controllers/AppController.java
@@ -348,15 +348,19 @@ public Response endpoint(@RequestBody Object body, @PathVariable String processI
             if(!verificationConfig.getEnabled() || !verificationConfig.getAutoVerify()){
                 return this.savePassport(processId, endpointData, passport);
             }
-            verificationManager.setVerificationStarted(processId);
-
             VerificationInfo verificationInfo = status.getVerification();
-            if(verificationInfo.vc){
 
-                verificationInfo = verificationManager.buildVerification(passport, verificationInfo);
+            // If is not enabled to be verified
+            if(!verificationInfo.vc){
+                return this.savePassport(processId, endpointData, passport);
             }
 
+            // Verify aspect
+            verificationManager.setVerificationStarted(processId);
+            verificationInfo = verificationManager.buildVerification(passport, verificationInfo);
+            verificationInfo = verificationManager.setupVerification(verificationInfo, passport);
             verificationManager.setVerificationInfo(processId, verificationInfo);
+
             return this.savePassport(processId, endpointData, passport);
         } catch (Exception e) {
             LogUtil.printException(e, "This request is not allowed! It must contain the valid attributes from an EDC endpoint");

diff --git a/.../src/main/java/org/eclipse/tractusx/digitalproductpass/core/services/ContractService.java b/.../src/main/java/org/eclipse/tractusx/digitalproductpass/core/services/ContractService.java
@@ -875,7 +875,7 @@ public Response getDataCall (HttpServletRequest httpRequest, HttpServletResponse
             if(verificationConfig.getEnabled()) {
                 responseData.put(
                         "verification",
-                        verificationManager.setupVerification(status.getVerification(), passport)
+                        status.getVerification()
                 );
             }
             response.data = responseData;

diff --git a/...ava/org/eclipse/tractusx/digitalproductpass/verification/manager/VerificationManager.java b/...ava/org/eclipse/tractusx/digitalproductpass/verification/manager/VerificationManager.java
@@ -28,6 +28,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.commons.logging.Log;
 import org.eclipse.tractusx.digitalproductpass.core.config.ProcessConfig;
 import org.eclipse.tractusx.digitalproductpass.core.exceptions.ManagerException;
 import org.eclipse.tractusx.digitalproductpass.core.managers.ProcessManager;
@@ -92,6 +93,9 @@ public String setVerificationStatus(String processId, SubModel subModel, String
             if(vc == null){
                 throw new ManagerException(this.getClass().getName(), "No configuration available for the verification process!");
             }
+            if(vc){
+                LogUtil.printMessage("[DPP VERIFICATION ADD-ON] [PROCESS "+processId+"] Verifiable Credential Aspect Found in subModel ["+ subModel.getIdentification()+"]!");
+            }
             String path = processManager.getProcessFilePath(processId, processManager.metaFileName);
             Status statusFile = null;
             if (!fileUtil.pathExists(path)) {
@@ -134,6 +138,8 @@ public String setVerificationStarted(String processId) {
             if (!fileUtil.pathExists(path)) {
                 throw new ManagerException(this.getClass().getName(), "Process file does not exists for id ["+processId+"]!");
             }
+
+            LogUtil.printMessage("[DPP VERIFICATION ADD-ON] [PROCESS "+ processId+"] Verification Started for Data Aspect Received from EDC!");
             History history = new History(
                     processId,
                     "VERIFYING",
@@ -172,6 +178,12 @@ public String setVerificationInfo(String processId, VerificationInfo verificatio
             if (!fileUtil.pathExists(path)) {
                 throw new ManagerException(this.getClass().getName(), "Process file does not exists for id ["+processId+"]!");
             }
+
+            if(verificationInfo.verified){
+                LogUtil.printMessage("[DPP VERIFICATION ADD-ON] [PROCESS "+ processId+"] [VERIFIED] The Data Aspect was verified Successfully!");
+            }else{
+                LogUtil.printMessage("[DPP VERIFICATION ADD-ON] [PROCESS "+ processId+"] [VERIFICATION FAILED] The Data Aspect was not able to be verified!");
+            }
             History history = new History(
                     processId,
                     verificationInfo.verified?"VERIFIED":"UNVERIFIED",
@@ -205,11 +217,11 @@ public Boolean isVerifiableCredential(SubModel subModel){
 
         List<SubModel.SemanticId.Key> semanticIds = semanticId.getKeys();
 
-        return semanticIds.stream().parallel().allMatch(key -> this.isKeyInKeys(key, keys));
+        return keys.stream().parallel().allMatch(semanticKey -> this.isKeyInKeys(semanticKey, semanticIds));
     }
 
-    public Boolean isKeyInKeys(SubModel.SemanticId.Key key, List<CDCConfig.SemanticKey> keys){
-        return keys.stream().parallel().anyMatch(semanticKey -> key.getType().equals(semanticKey.getKey()) && key.getValue().equals(semanticKey.getValue()));
+    public Boolean isKeyInKeys(CDCConfig.SemanticKey key, List<SubModel.SemanticId.Key> keys){
+        return keys.stream().parallel().anyMatch(semanticKey -> key.getKey().equals(semanticKey.getType()) && key.getValue().equals(semanticKey.getValue()));
     }
 
     public VerificationInfo setupVerification(VerificationInfo verificationInfo, JsonNode passport){