DigiLocker Impl update the properties and add properties (#542)

sunbird-cb · Apr 29, 2024 · 36d95f0 · 36d95f0
1 parent 0e10b7d
commit 36d95f0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/src/main/java/org/sunbird/digilocker/model/DocResponseDetails.java b/src/main/java/org/sunbird/digilocker/model/DocResponseDetails.java
@@ -6,6 +6,7 @@ public class DocResponseDetails {
 
     private String docContent;
     private String dataContent;
+    private String docDescription;
 
     public DocResponseDetails() {
     }
@@ -28,4 +29,13 @@ public void setDataContent(String dataContent) {
         this.dataContent = dataContent;
     }
 
+    @JacksonXmlProperty(localName = "DocDescription", namespace = "http://tempuri.org/")
+    public String getDocDescription() {
+        return docDescription;
+    }
+
+    public void setDocDescription(String docDescription) {
+        this.docDescription = docDescription;
+    }
+
 }
diff --git a/src/main/java/org/sunbird/digilocker/model/URIRequestDocDetails.java b/src/main/java/org/sunbird/digilocker/model/URIRequestDocDetails.java
@@ -13,7 +13,7 @@ public class URIRequestDocDetails {
     @JacksonXmlProperty(localName = "DocType")
     private String DocType;
 
-    @JacksonXmlProperty(localName = "Mobile")
+    @JacksonXmlProperty(localName = "mobile_no")
     private String Mobile;
 
     @JacksonXmlProperty(localName = "FullName")

diff --git a/src/main/java/org/sunbird/digilocker/model/URIResponseDocDetails.java b/src/main/java/org/sunbird/digilocker/model/URIResponseDocDetails.java
@@ -8,6 +8,7 @@ public class URIResponseDocDetails {
     private String URI;
     private String docContent;
     private String dataContent;
+    private String docDescription;
 
     public URIResponseDocDetails() {
         this.issuedTo = new IssuedTo();
@@ -48,5 +49,14 @@ public String getDataContent() {
     public void setDataContent(String dataContent) {
         this.dataContent = dataContent;
     }
+
+    @JacksonXmlProperty(localName = "DocDescription", namespace = "http://tempuri.org/")
+    public String getDocDescription() {
+        return docDescription;
+    }
+
+    public void setDocDescription(String docDescription) {
+        this.docDescription = docDescription;
+    }
 }
 
diff --git a/src/main/java/org/sunbird/digilocker/service/DigiLockerIntegrationServiceImpl.java b/src/main/java/org/sunbird/digilocker/service/DigiLockerIntegrationServiceImpl.java
@@ -14,6 +14,7 @@
 import org.springframework.web.client.RestTemplate;
 import org.sunbird.cassandra.utils.CassandraOperation;
 import org.sunbird.common.model.SBApiResponse;
+import org.sunbird.common.service.ContentService;
 import org.sunbird.common.service.OutboundRequestHandlerServiceImpl;
 import org.sunbird.common.util.CbExtServerProperties;
 import org.sunbird.common.util.Constants;
@@ -50,6 +51,9 @@ public class DigiLockerIntegrationServiceImpl implements DigiLockerIntegrationSe
 
     @Autowired
     ObjectMapper objectMapper;
+
+    @Autowired
+    ContentService contentService;
     private Logger logger = LoggerFactory.getLogger(getClass().getName());
     SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd-MM-yyyy");
@@ -160,6 +164,10 @@ public PullURIResponse generateURIResponse(String digiLockerHmac, String request
                                     docDetails.setDataContent(encodeBytesToBase64((convertObjectToJsonBytes(addCertificateInfo(certificateAddInfoDTO)))));
                                     docDetails.setURI(serverProperties.getDigiLockerIssuerId() + "-" + request.getDocDetails().getDocType() + "-" + docId);
                                     responseStatus.setStatus("1");
+                                    Map<String, Object> contentResponse = contentService.readContentFromCache((String)dockerLookUpInfo.get(Constants.COURSE_ID), Arrays.asList(Constants.NAME));
+                                    if (MapUtils.isNotEmpty(contentResponse)) {
+                                        docDetails.setDocDescription((String) contentResponse.get(Constants.NAME));
+                                    }
                                 } else {
                                     logger.error("Not able to generate Pdf certificate for URI: " + docDetails.getURI());
                                     responseStatus.setStatus("0");
@@ -237,6 +245,10 @@ public PullDocResponse generateDocResponse(String digiLockerHmac, String request
                         certificateAddInfoDTO.setSwdIndicator(String.valueOf(((String)getUserInfo.get(Constants.CHANNEL)).charAt(0)));
                         docDetails.setDataContent(encodeBytesToBase64((convertObjectToJsonBytes(addCertificateInfo(certificateAddInfoDTO)))));
                         response.setDocDetails(docDetails);
+                        Map<String, Object> contentResponse = contentService.readContentFromCache((String)digiLockerDocInfo.get(Constants.COURSE_ID), Arrays.asList(Constants.NAME));
+                        if (MapUtils.isNotEmpty(contentResponse)) {
+                            docDetails.setDocDescription((String) contentResponse.get(Constants.NAME));
+                        }
                         responseStatus.setStatus("1");
                     } else {
                         logger.error("Error while getting the user Info request:" + request);