Merge pull request #232 from tw-mosip/injiweb-570-render-avl-fields-i…

…n-pdf [INJIWEB-570]: render only the fields that has values in the PDF template
mosip · May 31, 2024 · fd0782a · fd0782a
2 parents 6022894 + 3206c79
commit fd0782a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/main/java/io/mosip/mimoto/dto/mimoto/CredentialsSupportedResponse.java b/src/main/java/io/mosip/mimoto/dto/mimoto/CredentialsSupportedResponse.java
@@ -5,6 +5,7 @@
 import lombok.Data;
 
 import java.util.List;
+import java.util.Set;
 
 @Data
 public class CredentialsSupportedResponse {
@@ -21,5 +22,5 @@ public class CredentialsSupportedResponse {
     private CredentialDefinitionResponseDto credentialDefinition;
 
     private List<CredentialSupportedDisplayResponse> display;
-    private List<String> order;
+    private Set<String> order;
 }
diff --git a/src/main/java/io/mosip/mimoto/service/impl/IssuersServiceImpl.java b/src/main/java/io/mosip/mimoto/service/impl/IssuersServiceImpl.java
@@ -35,12 +35,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -167,12 +162,13 @@ public ByteArrayInputStream generatePdfForVerifiableCredentials(String accessTok
         if (vcCredentialResponse == null) throw new RuntimeException("VC Credential Issue API not accessible");
         Map<String, Object> credentialProperties = vcCredentialResponse.getCredential().getCredentialSubject();
         LinkedHashMap<String,Object> displayProperties = new LinkedHashMap<>();
-        List<String> orderProperty = credentialsSupportedResponse.getOrder();
-        if(orderProperty == null) {
-            vcPropertiesFromWellKnown.keySet().forEach(vcProperty -> displayProperties.put(vcPropertiesFromWellKnown.get(vcProperty), credentialProperties.get(vcProperty)));
-        } else {
-            orderProperty.forEach(vcProperty -> displayProperties.put(vcPropertiesFromWellKnown.get(vcProperty), credentialProperties.get(vcProperty)));
-        }
+        Set<String> orderProperty = credentialsSupportedResponse.getOrder();
+        Set<String> fieldProperty = orderProperty != null ? orderProperty : vcPropertiesFromWellKnown.keySet();
+        fieldProperty.forEach(vcProperty -> {
+            if(credentialProperties.get(vcProperty) != null && !"".equals(credentialProperties.get(vcProperty))) {
+                displayProperties.put(vcPropertiesFromWellKnown.get(vcProperty), credentialProperties.get(vcProperty));
+            }
+        });
         return getPdfResourceFromVcProperties(displayProperties, credentialsSupportedResponse,  vcCredentialResponse,
                 issuerDTO.getDisplay().stream().map(d -> d.getLogo().getUrl()).findFirst().orElse(""));
     }