Merge pull request #49 from KB-iGOT/dev-4.8.20

Dev 4.8.20
KB-iGOT · Nov 25, 2024 · cf178fb · cf178fb
2 parents 4a68cc3 + 8c82c85
commit cf178fb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/...event-cert-generator/src/main/scala/org/event/job/certgen/function/NotifierFunction.scala b/...event-cert-generator/src/main/scala/org/event/job/certgen/function/NotifierFunction.scala
@@ -62,6 +62,7 @@ class NotifierFunction(config: EventCertificateGeneratorConfig, httpUtil: HttpUt
           logger.info("Sending notification email. URL: {}", url)
           val notifyTemplate = getNotifyTemplateFromRes(certTemplate.get(metaData.templateId))
           val ratingUrl = config.domainUrl + config.ratingMidPoint + metaData.eventId + config.ratingEndPoint + metaData.batchId
+          val tocUrl = config.domainUrl + config.eventMidPoint + metaData.eventId
           val request = mutable.Map[String, AnyRef]("request" -> (notifyTemplate ++ mutable.Map[String, AnyRef](
             config.firstName -> userResponse.getOrElse(config.firstName, "").asInstanceOf[String],
             config.trainingName -> metaData.courseName,
@@ -72,7 +73,8 @@ class NotifierFunction(config: EventCertificateGeneratorConfig, httpUtil: HttpUt
             config.courseName -> metaData.courseName,
             config.courseProvider -> metaData.courseProvider,
             config.coursePosterImage -> metaData.coursePosterImage,
-            config.profileUpdateLink -> (config.webPortalUrl + config.profileUpdateUrl)
+            config.profileUpdateLink -> (config.webPortalUrl + config.profileUpdateUrl),
+            config.link -> tocUrl
           )))
           val response = httpUtil.post(url, ScalaJsonUtil.serialize(request))
           if (response.status == 200) {

diff --git a/...generator/src/main/scala/org/event/job/certgen/task/EventCertificateGeneratorConfig.scala b/...generator/src/main/scala/org/event/job/certgen/task/EventCertificateGeneratorConfig.scala
@@ -190,5 +190,6 @@ class EventCertificateGeneratorConfig(override val config: Config) extends BaseJ
   val webPortalUrl: String = config.getString("web.portal.url")
 
   val enableUserNotification: Boolean = if (config.hasPath("enable.user.email.notification")) config.getBoolean("enable.user.email.notification") else true
-
+  val eventMidPoint: String = "/app/event-hub/home/"
+  val link: String = "link"
 }
diff --git a/kubernets/helm_charts/datapipeline_jobs/values.j2 b/kubernets/helm_charts/datapipeline_jobs/values.j2
@@ -293,7 +293,7 @@ post-publish-processor:
       systemSettingsTable = system_settings
       hierarchyStoreKeySpace = "{{ env}}_hierarchy_store"
       eventBatchTable = "event_batch"
-      eventCertTemplateId = defaultEventCertTemplate
+      eventCertTemplateId = defaultEventCertTemplateV1
     }
     dialcode-cassandra {
       keyspace = "dialcodes"