4.8.27.2 dev v9 (#225)

Sahil-tarento · shankaragoudab · ArpithaSureshappa · web-flow · commit d923517654e0 · 2025-08-14T19:58:22.000+05:30
* fix for the content state update issue (#220) * KB-11245 The email notification triggered and the course name is not … (#222) * KB-11245 The email notification triggered and the course name is not in a enrolled language issue fix * KB-11245 The email notification triggered and the course name is not in a enrolled language issue fix * KB-11245 The email notification triggered and the course name is not in a enrolled language issue fix added null check for recentLanguage (#224) * KB-11245 The email notification triggered and the course name is not in a enrolled language issue fix * KB-11245 The email notification triggered and the course name is not in a enrolled language issue fix * KB-11245 The email notification triggered and the course name is not in a enrolled language issue fix * KB-11245 The email notification triggered and the course name is not in a enrolled language issue fix added null check for recentLanguage * KB-11245 The email notification triggered and the course name is not in a enrolled language issue fix added null check for recentLanguage --------- Co-authored-by: shankaragoudab <140387294+shankaragoudab@users.noreply.github.com> Co-authored-by: Arpitha <arpitha.sureshappa@tarento.com>
diff --git a/course-mw/course-actors/src/main/java/org/sunbird/learner/actors/coursebatch/CourseBatchNotificationActor.java b/course-mw/course-actors/src/main/java/org/sunbird/learner/actors/coursebatch/CourseBatchNotificationActor.java
@@ -5,6 +5,7 @@
 import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.sunbird.actor.base.BaseActor;
 import org.sunbird.common.Constants;
 import org.sunbird.common.models.util.ActorOperations;
@@ -68,6 +69,9 @@ private void courseBatchNotification(Request request) throws Exception {
 
     CourseBatch courseBatch = (CourseBatch) requestMap.get(JsonKey.COURSE_BATCH);
     String authToken = (String) request.getContext().getOrDefault(JsonKey.X_AUTH_TOKEN, "");
+    String recentLanguage = StringUtils.defaultString(
+            (String) requestMap.get(JsonKey.RECENT_LANGUAGE), ""
+    );
 
     String userId = (String) requestMap.get(JsonKey.USER_ID);
     logger.info(request.getRequestContext(), "CourseBatchNotificationActor:courseBatchNotification: userId = " + userId);
@@ -83,6 +87,7 @@ private void courseBatchNotification(Request request) throws Exception {
       String template = JsonKey.OPEN_BATCH_LEARNER_UNENROL;
       String subject = JsonKey.UNENROLL_FROM_COURSE_BATCH;
 
+
       String operationType = (String) requestMap.get(JsonKey.OPERATION_TYPE);
 
       if (operationType.equals(JsonKey.ADD)) {
@@ -91,7 +96,7 @@ private void courseBatchNotification(Request request) throws Exception {
       }
 
       triggerEmailNotification( request.getRequestContext(), 
-          Arrays.asList(userId), courseBatch, subject, template, contentDetails, authToken);
+          Arrays.asList(userId), courseBatch, subject, template, contentDetails, authToken, recentLanguage);
 
     } else {
       logger.info(request.getRequestContext(), "CourseBatchNotificationActor:courseBatchNotification: Invite only batch");
@@ -104,13 +109,13 @@ private void courseBatchNotification(Request request) throws Exception {
           courseBatch,
           JsonKey.COURSE_INVITATION,
           JsonKey.BATCH_MENTOR_ENROL,
-          contentDetails, authToken);
+          contentDetails, authToken, recentLanguage);
       triggerEmailNotification(
               request.getRequestContext(), removedMentors,
           courseBatch,
           JsonKey.UNENROLL_FROM_COURSE_BATCH,
           JsonKey.BATCH_MENTOR_UNENROL,
-          contentDetails, authToken);
+          contentDetails, authToken, recentLanguage);
 
       List<String> addedParticipants = (List<String>) requestMap.get(JsonKey.ADDED_PARTICIPANTS);
       List<String> removedParticipants =
@@ -121,13 +126,13 @@ private void courseBatchNotification(Request request) throws Exception {
           courseBatch,
           JsonKey.COURSE_INVITATION,
           JsonKey.BATCH_LEARNER_ENROL,
-          contentDetails, authToken);
+          contentDetails, authToken, recentLanguage);
       triggerEmailNotification(
               request.getRequestContext(), removedParticipants,
           courseBatch,
           JsonKey.UNENROLL_FROM_COURSE_BATCH,
           JsonKey.BATCH_LEARNER_UNENROL,
-          contentDetails, authToken);
+          contentDetails, authToken,recentLanguage);
     }
   }
 
@@ -136,7 +141,7 @@ private void triggerEmailNotification(
           CourseBatch courseBatch,
           String subject,
           String template,
-          Map<String, Object> contentDetails, String authToken) throws Exception {
+          Map<String, Object> contentDetails, String authToken, String recentLanguage) throws Exception {
 
     logger.debug(requestContext, "CourseBatchNotificationActor:triggerEmailNotification: userIdList = "
             + userIdList);
@@ -145,7 +150,7 @@ private void triggerEmailNotification(
 
     for (String userId : userIdList) {
       Map<String, Object> requestMap =
-          createEmailRequest(userId, courseBatch, contentDetails, subject, template);
+          createEmailRequest(userId, courseBatch, contentDetails, subject, template, recentLanguage);
 
       logger.info(requestContext, "CourseBatchNotificationActor:triggerEmailNotification: requestMap = " + requestMap);
       sendMail(requestContext, requestMap, authToken);
@@ -158,33 +163,63 @@ private Map<String, Object> createEmailRequest(
       CourseBatch courseBatch,
       Map<String, Object> contentDetails,
       String subject,
-      String template) throws Exception {
+      String template,
+      String recentLanguage) throws Exception {
     Map<String, Object> courseBatchObject = JsonUtil.convert(courseBatch, Map.class);
 
     logger.info(null,"Course Batch Details in email Request: " + courseBatchObject + ": contentDetails: " + contentDetails);
     Map<String, Object> request = new HashMap<>();
     Map<String, Object> requestMap = new HashMap<String, Object>();
+    List<?> languageList = (List<?>) contentDetails.get(JsonKey.LANGUAGE);
+    String langValue = (CollectionUtils.isNotEmpty(languageList) && languageList.get(0) != null)
+            ? languageList.get(0).toString()
+            : "";
+    if (StringUtils.isNotBlank(recentLanguage) && !recentLanguage.equalsIgnoreCase(langValue)) {
+      Object langMapObj = contentDetails.get(JsonKey.LANGUAGE_MAP);
+      if (langMapObj instanceof Map) {
+        Map<?, ?> langMap = (Map<?, ?>) langMapObj;
+        Object recentLangObj = langMap.get(recentLanguage);
+        if (recentLangObj instanceof Map) {
+          Map<?, ?> recentLangMap = (Map<?, ?>) recentLangObj;
+          String id = recentLangMap.get(JsonKey.ID).toString();
+          Map<String, Object> recentLangContentDetail = ContentUtil.getContent(id, Arrays.asList(JsonKey.APP_ICON, JsonKey.POSTER_IMAGE, JsonKey.NAME));
+          Map<String, Object> content = (Map<String, Object>) recentLangContentDetail.get(JsonKey.CONTENT);
+          requestMap.put(JsonKey.COURSE_LOGO_URL, content.get(JsonKey.APP_ICON));
+          if (content.containsKey(JsonKey.POSTER_IMAGE)) {
+            String posterImageUrl = (String) content.get(JsonKey.POSTER_IMAGE);
+            if (posterImageUrl.contains(staticHostUrl)) {
+              String[] posterImageUrlArr = posterImageUrl.split("/content/");
+              posterImageUrl = baseUrl + contentBucket + "/" + posterImageUrlArr[1];
+            }
+            requestMap.put(JsonKey.COURSE_POSTER_IMAGE, posterImageUrl);
+          }
+          requestMap.put(JsonKey.COURSE_NAME, content.get(JsonKey.NAME));
+        }
+      }
+    } else {
+      requestMap.put(JsonKey.COURSE_LOGO_URL, contentDetails.get(JsonKey.APP_ICON));
+      if (contentDetails.containsKey(JsonKey.POSTER_IMAGE)) {
+        String posterImageUrl = (String) contentDetails.get(JsonKey.POSTER_IMAGE);
+        if (posterImageUrl.contains(staticHostUrl)) {
+          String[] posterImageUrlArr = posterImageUrl.split("/content/");
+          posterImageUrl = baseUrl + contentBucket + "/" + posterImageUrlArr[1];
+        }
+        requestMap.put(JsonKey.COURSE_POSTER_IMAGE, posterImageUrl);
+      }
+      requestMap.put(JsonKey.COURSE_NAME, contentDetails.get(JsonKey.NAME));
+    }
 
     requestMap.put(JsonKey.SUBJECT, subject);
     requestMap.put(JsonKey.EMAIL_TEMPLATE_TYPE, template);
     requestMap.put(JsonKey.BODY, "Notification mail Body");
     requestMap.put(JsonKey.ORG_NAME, courseBatchObject.get(JsonKey.ORG_NAME));
-    requestMap.put(JsonKey.COURSE_LOGO_URL, contentDetails.get(JsonKey.APP_ICON));
-    if (contentDetails.containsKey(JsonKey.POSTER_IMAGE)) {
-      String posterImageUrl = (String) contentDetails.get(JsonKey.POSTER_IMAGE);
-      if (posterImageUrl.contains(staticHostUrl)) {
-        String[] posterImageUrlArr = posterImageUrl.split("/content/");
-        posterImageUrl = baseUrl + contentBucket + "/" + posterImageUrlArr[1];
-      }
-      requestMap.put(JsonKey.COURSE_POSTER_IMAGE, posterImageUrl);
-    }
-    requestMap.put(JsonKey.PROVIDER_NAME, contentDetails.get(JsonKey.SOURCE));
     requestMap.put(JsonKey.PROFILE_UPDATE_LINK, baseUrl + profileUpdateUrl);
+    requestMap.put(JsonKey.PROVIDER_NAME, contentDetails.get(JsonKey.SOURCE));
     requestMap.put(JsonKey.START_DATE, courseBatchObject.get(JsonKey.START_DATE));
     requestMap.put(JsonKey.END_DATE, courseBatchObject.get(JsonKey.END_DATE));
     requestMap.put(JsonKey.COURSE_ID, courseBatchObject.get(JsonKey.COURSE_ID));
     requestMap.put(JsonKey.BATCH_NAME, courseBatch.getName());
-    requestMap.put(JsonKey.COURSE_NAME, contentDetails.get(JsonKey.NAME));
+
     requestMap.put(JsonKey.MEETING_LINK, meetingLinkUrl);
     requestMap.put(
         JsonKey.COURSE_BATCH_URL,
diff --git a/course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ExtendedCourseEnrollmentActor.scala b/course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ExtendedCourseEnrollmentActor.scala
@@ -138,7 +138,8 @@ class ExtendedCourseEnrollmentActor @Inject()(@Named("course-batch-notification-
 
       // Telemetry and notification
       generateTelemetryAudit(userId, courseId, batchId, data, "enrol", JsonKey.CREATE, request.getContext)
-      notifyUser(userId, batchData, JsonKey.ADD)
+      val recentLanguage = data.getOrDefault(JsonKey.RECENT_LANGUAGE, "").asInstanceOf[String]
+      notifyUser(userId, batchData, JsonKey.ADD, recentLanguage)
     } else {
       ProjectCommonException.throwClientErrorException(ResponseCode.accessDeniedToEnrolOrUnenrolCourse, courseId)
     }
@@ -285,14 +286,15 @@ class ExtendedCourseEnrollmentActor @Inject()(@Named("course-batch-notification-
     TelemetryUtil.telemetryProcessingCall(request, targetedObject, correlationObject, contextMap, "enrol")
   }
 
-  def notifyUser(userId: String, batchData: CourseBatch, operationType: String): Unit = {
+  def notifyUser(userId: String, batchData: CourseBatch, operationType: String, recentLanguage: String): Unit = {
     val isNotifyUser = java.lang.Boolean.parseBoolean(PropertiesCache.getInstance().getProperty(JsonKey.SUNBIRD_COURSE_BATCH_NOTIFICATIONS_ENABLED))
     if (isNotifyUser) {
       val request = new Request()
       request.setOperation(ActorOperations.COURSE_BATCH_NOTIFICATION.getValue)
       request.put(JsonKey.USER_ID, userId)
       request.put(JsonKey.COURSE_BATCH, batchData)
       request.put(JsonKey.OPERATION_TYPE, operationType)
+      request.put(JsonKey.RECENT_LANGUAGE, recentLanguage)
       courseBatchNotificationActorRef.tell(request, getSelf())
     }
   }
@@ -713,10 +715,16 @@ class ExtendedCourseEnrollmentActor @Inject()(@Named("course-batch-notification-
 
   def updateProgressData(enrolments: java.util.List[java.util.Map[String, AnyRef]], requestContext: RequestContext): util.List[java.util.Map[String, AnyRef]] = {
     enrolments.map { enrolment =>
-      val leafNodesCount: Int = enrolment.getOrDefault("leafNodesCount", 0.asInstanceOf[AnyRef]).asInstanceOf[Int]
-      val progress: Int = enrolment.getOrDefault("progress", 0.asInstanceOf[AnyRef]).asInstanceOf[Int]
-      enrolment.put("status", getCompletionStatus(progress, leafNodesCount).asInstanceOf[AnyRef])
-      enrolment.put("completionPercentage", getCompletionPerc(progress, leafNodesCount).asInstanceOf[AnyRef])
+      val statusObj: Int = enrolment.getOrDefault("status", 0.asInstanceOf[AnyRef]).asInstanceOf[Int]
+      if (statusObj.equals(2)) {
+        enrolment.put("status", 2.asInstanceOf[AnyRef])
+        enrolment.put("completionPercentage", 100.asInstanceOf[AnyRef])
+      } else {
+        val leafNodesCount: Int = enrolment.getOrDefault("leafNodesCount", 0.asInstanceOf[AnyRef]).asInstanceOf[Int]
+        val progress: Int = enrolment.getOrDefault("progress", 0.asInstanceOf[AnyRef]).asInstanceOf[Int]
+        enrolment.put("status", getCompletionStatus(progress, leafNodesCount).asInstanceOf[AnyRef])
+        enrolment.put("completionPercentage", getCompletionPerc(progress, leafNodesCount).asInstanceOf[AnyRef])
+      }
 
       jsonFields.foreach { field =>
         if (enrolment.containsKey(field) && null != enrolment.get(field)) {
@@ -832,7 +840,8 @@ class ExtendedCourseEnrollmentActor @Inject()(@Named("course-batch-notification-
     generatePreProcessorKafkaEvent(request,batchId, programId, userId)
     sender().tell(successResponse(), self)
     generateTelemetryAudit(userId, programId, batchId, data, "enrol", JsonKey.CREATE, request.getContext)
-    notifyUser(userId, batchData, JsonKey.ADD)
+
+    notifyUser(userId, batchData, JsonKey.ADD, recentLanguage)
     cacheUtil.delete(getCacheBatchKey(batchId))
   }
 
@@ -988,7 +997,7 @@ class ExtendedCourseEnrollmentActor @Inject()(@Named("course-batch-notification-
       cacheUtil.delete(getCacheKey(userId))
       sender().tell(successResponse(), self)
       generateTelemetryAudit(userId, courseId, batchId, data, "enrol", JsonKey.CREATE, request.getContext)
-      notifyUser(userId, batchData, JsonKey.ADD)
+      notifyUser(userId, batchData, JsonKey.ADD, courseLanguage)
       val dataMap = new java.util.HashMap[String, AnyRef]
       val requestMap = new java.util.HashMap[String, AnyRef]
       requestMap.put(JsonKey.COURSE_ID,courseId)
@@ -1104,7 +1113,7 @@ class ExtendedCourseEnrollmentActor @Inject()(@Named("course-batch-notification-
         cacheUtil.delete(getCacheKey(userId))
         generatePreProcessorKafkaEvent(request, batchId, programId, userId)
         generateTelemetryAudit(userId, programId, batchId, data, "enrol", JsonKey.CREATE, request.getContext)
-        notifyUser(userId, batchData, JsonKey.ADD)
+        notifyUser(userId, batchData, JsonKey.ADD, courseLanguage)
         status.put(JsonKey.STATUS, JsonKey.SUCCESS)
         response.put(userId, status)
       } catch {
@@ -1296,7 +1305,7 @@ class ExtendedCourseEnrollmentActor @Inject()(@Named("course-batch-notification-
       logger.info(request.getRequestContext, "CourseEnrolmentActor :: enroll :: Deleting redis for key " + getCacheKey(userId))
       cacheUtil.delete(getCacheKey(userId))
       generateTelemetryAudit(userId, courseId, batchId, data, "enrol", JsonKey.CREATE, request.getContext)
-      notifyUser(userId, batchData, JsonKey.ADD)
+      notifyUser(userId, batchData, JsonKey.ADD , recentLanguage)
     } catch {
       case e: ProjectCommonException =>
         if (ResponseCode.userAlreadyEnrolledCourse.getErrorMessage.equals(e.getMessage))
