fix the certficateIssue

Author: Sahil-tarento

all-actors/src/main/java/org/sunbird/cert/actor/CertificateGeneratorActor.java

@@ -102,7 +102,7 @@ private void generateCertificate(Request request) throws BaseException {
             String courseId = (String) request.getRequest().get(JsonKeys.COURSE_ID);
             String batchId = (String) request.getRequest().get(JsonKeys.BATCH_ID);
             String userId = (String) request.getRequest().get(JsonKeys.USER_ID);
-            /*List<String> userToken = scala.collection.JavaConverters.seqAsJavaList(
+            List<String> userToken = scala.collection.JavaConverters.seqAsJavaList(
                     (scala.collection.Seq<String>) request.getHeaders().get(JsonKeys.X_AUTHENTICATED_USER_TOKEN)
             );
             String userIdFromToken = AccessTokenValidator.verifyUserToken(userToken.get(0), true);
@@ -114,7 +114,7 @@ private void generateCertificate(Request request) throws BaseException {
             if (StringUtils.isNotEmpty(userIdFromToken) && !userId.equalsIgnoreCase(userIdFromToken)) {
                 logger.error("generateCertificateV2:Exception Occurred while generating certificate. User token is different from the request UserId" + userId);
                 throw new BaseException(IResponseMessage.INVALID_REQUESTED_DATA, "You are not authorized to get the certificate for other user", ResponseCode.BAD_REQUEST.getCode());
-            }*/
+            }
             Map<String, Object> contentInfo = issueCertificateContentHelper.getCourseInfo(courseId);
             boolean isUserEligibleForCertificate = true;
             boolean isEvent = false;
@@ -192,10 +192,11 @@ private String generatePrintURIAndUpdateRecord(String courseId, String batchId,
                 String encodedSvg = "";
                 for (CertModel certModel : certModelList) {
                     try {
-                        CertificateExtension certificateExtension = certificateGenerator.getCertificateExtension(certModel);
                         if (MapUtils.isNotEmpty(v2CertificateRegistryMap)) {
                             uuid = (String) v2CertificateRegistryMap.get(JsonKeys.ID);
-                        } else {
+                        }
+                        CertificateExtension certificateExtension = certificateGenerator.getCertificateExtension(certModel, uuid);
+                        if (StringUtils.isBlank(uuid)) {
                             uuid = certificateGenerator.getUUID(certificateExtension);
                         }
                         Map<String, Object> qrMap = new HashMap<>();

certificate-processor/src/main/java/org/sunbird/incredible/CertificateGenerator.java

@@ -52,9 +52,9 @@ public CertificateGenerator(Map<String, String> properties) {
         this.properties = properties;
     }
 
-    public CertificateExtension getCertificateExtension (CertModel certModel) throws SignatureException.UnreachableException,
+    public CertificateExtension getCertificateExtension (CertModel certModel, String certificateUUID) throws SignatureException.UnreachableException,
             InvalidDateFormatException, SignatureException.CreationException, IOException {
-        this.certificateExtension = certificateFactory.createCertificate(certModel, properties);
+        this.certificateExtension = certificateFactory.createCertificate(certModel, properties, certificateUUID);
         return certificateExtension;
     }
 

certificate-processor/src/main/java/org/sunbird/incredible/processor/CertificateFactory.java

@@ -37,11 +37,15 @@ public class CertificateFactory {
 
     private ObjectMapper mapper = new ObjectMapper();
 
-    public CertificateExtension createCertificate(CertModel certModel, Map<String, String> properties)
+    public CertificateExtension createCertificate(CertModel certModel, Map<String, String> properties, String certificateUUID)
             throws InvalidDateFormatException, SignatureException.UnreachableException, IOException, SignatureException.CreationException {
 
         String basePath = getDomainUrl(properties);
-        uuid = basePath + "/" + UUID.randomUUID().toString();
+        if (StringUtils.isNotBlank(certificateUUID)) {
+            uuid = basePath + "/" + certificateUUID;
+        } else {
+            uuid = basePath + "/" + UUID.randomUUID().toString();
+        }
         CertificateExtensionBuilder certificateExtensionBuilder = new CertificateExtensionBuilder(properties.get(JsonKey.CONTEXT));
         CompositeIdentityObjectBuilder compositeIdentityObjectBuilder = new CompositeIdentityObjectBuilder(properties.get(JsonKey.CONTEXT));
         BadgeClassBuilder badgeClassBuilder = new BadgeClassBuilder(properties.get(JsonKey.CONTEXT));