Fixed multiple minor issues whihc which were causing jobs to fail on QA

sunbird-cb · May 30, 2024 · 73e57e9 · 73e57e9
1 parent 3f6da64
commit 73e57e9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/batch-models/src/main/scala/org/ekstep/analytics/dashboard/DataUtil.scala b/batch-models/src/main/scala/org/ekstep/analytics/dashboard/DataUtil.scala
@@ -825,7 +825,7 @@ object DataUtil extends Serializable {
     df
   }
 
-  def contentDataFrames(orgDF: DataFrame, primaryCategories: Seq[String] = Seq("Course","Moderated Course","Program","Invite-Only Program","Moderated Program","Blended Program","Curated Program","Standalone Assessment","Moderated Assessment","CuratedCollections","Invite-Only Assessment"), runValidation: Boolean = true)(implicit spark: SparkSession, conf: DashboardConfig): (DataFrame, DataFrame, DataFrame, DataFrame) = {
+  def contentDataFrames(orgDF: DataFrame, primaryCategories: Seq[String] = Seq("Course","Program","Blended Program","Curated Program","Standalone Assessment","CuratedCollections"), runValidation: Boolean = true)(implicit spark: SparkSession, conf: DashboardConfig): (DataFrame, DataFrame, DataFrame, DataFrame) = {
     validatePrimaryCategories(primaryCategories)
 
     val hierarchyDF = contentHierarchyDataFrame()

diff --git a/batch-models/src/main/scala/org/ekstep/analytics/dashboard/exhaust/DataExhaustModel.scala b/batch-models/src/main/scala/org/ekstep/analytics/dashboard/exhaust/DataExhaustModel.scala
@@ -54,7 +54,7 @@ object DataExhaustModel extends AbsDashboardModel {
     cache.write(roleDF, "role")
 
     // ES content
-    val primaryCategories = Seq("Course","Moderated Course","Program","Invite-Only Program","Moderated Program","Blended Program","Curated Program","Standalone Assessment","Moderated Assessment","CuratedCollections","Invite-Only Assessment")
+    val primaryCategories = Seq("Course","Program","Blended Program","Curated Program","Standalone Assessment","CuratedCollections")
     val shouldClause = primaryCategories.map(pc => s"""{"match":{"primaryCategory.raw":"${pc}"}}""").mkString(",")
     val fields = Seq("identifier", "name", "primaryCategory", "status", "reviewStatus", "channel", "duration", "leafNodesCount", "lastPublishedOn", "lastStatusChangedOn", "createdFor", "competencies_v5", "programDirectorName")
     val arrayFields = Seq("createdFor")

diff --git a/...s/src/main/scala/org/ekstep/analytics/dashboard/report/enrolment/UserEnrolmentModel.scala b/...s/src/main/scala/org/ekstep/analytics/dashboard/report/enrolment/UserEnrolmentModel.scala
@@ -156,7 +156,7 @@ object UserEnrolmentModel extends AbsDashboardModel {
         col("batchID").alias("batch_id"),
         col("courseID").alias("content_id"),
         col("completionPercentage").alias("content_progress_percentage"),
-        col("completedOn").alias("completed_on"),
+        col("completedOn").alias("last_accessed_on"),
         col("firstCompletedOn").alias("first_completed_on"),
         col("Certificate_Generated").alias("certificate_generated"),
         col("certificate_generated_on").alias("certificate_generated_on"),