Fix : KB-12962 Event Certificate provider name empty (#33)

Co-authored-by: sreerag <sreerag.sajeesh@tarento.com>
Co-authored-by: Karthikeyan Rajendran <70887864+karthik-tarento@users.noreply.github.com>

Author: 3 people

all-actors/src/main/java/org/sunbird/cert/helper/IssueCertificateContentHelper.java

@@ -349,7 +349,7 @@ private Map<String, Object> generateCertificateEvent(Map<String, Object> request
         eData.put("courseName", courseName);
         eData.put("basePath", propertiesCache.getProperty("cert_domain_url") + "/certs");
         eData.put("name", certName);
-        eData.put("providerName", courseInfo.getOrDefault("sourceName", ""));
+        eData.put("providerName", courseInfo.getOrDefault("providerName", ""));
         eData.put("tag", requestMap.get(JsonKeys.BATCH_ID));
         eData.put("primaryCategory", courseInfo.getOrDefault("primaryCategory", ""));
         eData.put("parentCollections", parentCollections);

all-actors/src/main/java/org/sunbird/cert/helper/IssueCertificateEventHelper.java

@@ -239,7 +239,7 @@ public static Map<String, Object> getCourseInfo(
         String courseMetadataString = contentCache.get(courseId, null, 0);
         if (StringUtils.isBlank(courseMetadataString)) {
             String url = PropertiesCache.getInstance().getProperty("content_basePath") + PropertiesCache.getInstance().getProperty("content_read_api") + "/" + courseId
-                    + "?fields=name,parentCollections,primaryCategory,posterImage,organisation";
+                    + "?fields=name,parentCollections,primaryCategory,posterImage,organisation,sourceName";
 
             Map<String, Object> responseObject = getAPICall(url);
             Map<String, Object> resultObject = (Map<String,Object>)responseObject.get(JsonKeys.RESULT);
@@ -248,20 +248,15 @@ public static Map<String, Object> getCourseInfo(
                 String courseName = sanitizeString((String) response.getOrDefault("name", ""));
                 String primaryCategory = sanitizeString((String) response.getOrDefault("primaryCategory", ""));
                 String posterImage = sanitizeString((String) response.getOrDefault("posterImage",""));
-
                 List<String> parentCollections = (List<String>) response.getOrDefault("parentCollections", new ArrayList<>());
-
-                List<Object> orgData = (List<Object>) response.getOrDefault("organisation", Collections.emptyList());
-                String providerName = extractProviderName(orgData);
-
+                String sourceName = sanitizeString((String) response.getOrDefault("sourceName", ""));
                 Map<String, Object> courseInfoMap = new HashMap<>();
                 courseInfoMap.put("courseId", courseId);
                 courseInfoMap.put("courseName", courseName);
                 courseInfoMap.put("parentCollections", parentCollections);
                 courseInfoMap.put("primaryCategory", primaryCategory);
                 courseInfoMap.put("coursePosterImage", posterImage);
-                courseInfoMap.put("providerName", providerName);
-
+                courseInfoMap.put("providerName", sourceName);
                 return courseInfoMap;
             } else {
                 logger.error("Not able to find the content info for :" + courseId);
@@ -273,17 +268,15 @@ public static Map<String, Object> getCourseInfo(
             String primaryCategory = sanitizeString((String) courseMetadata.getOrDefault("primaryCategory", ""));
             List<String> parentCollections = (List<String>) courseMetadata.getOrDefault("parentCollections", new ArrayList<>());
             String posterImage = sanitizeString((String) courseMetadata.getOrDefault("posterImage", ""));
-
-            List<Object> orgData = (List<Object>) courseMetadata.getOrDefault("organisation", Collections.emptyList());
-            String providerName = extractProviderName(orgData);
+            String sourceName = sanitizeString((String) courseMetadata.getOrDefault("sourceName", ""));
 
             Map<String, Object> courseInfoMap = new HashMap<>();
             courseInfoMap.put("courseId", courseId);
             courseInfoMap.put("courseName", courseName);
             courseInfoMap.put("parentCollections", parentCollections);
             courseInfoMap.put("primaryCategory", primaryCategory);
             courseInfoMap.put("coursePosterImage", posterImage);
-            courseInfoMap.put("providerName", providerName);
+            courseInfoMap.put("providerName", sourceName);
 
             return courseInfoMap;
         }
@@ -298,14 +291,6 @@ private static String sanitizeString(String input) {
                 .orElse("");
     }
 
-    private static String extractProviderName(List<Object> orgData) {
-        if (!orgData.isEmpty()) {
-            String pm = orgData.get(0).toString();
-            return pm;
-        }
-        return "";
-    }
-
     public Response fetchEventTemplate(String eventId, String batchId) throws BaseException {
         Map<String, Object> primaryKey = new HashMap<>();
         primaryKey.put(JsonKeys.EVENT_ID, eventId);