Merge pull request #178 from ishawakankar/report-changes

Course and Assessment report changes for userid column in redis
Sunbird-Ed · Aug 7, 2020 · bd1c924 · bd1c924
2 parents b4d24a0 + a8f54ae
commit bd1c924
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/data-products/src/main/scala/org/sunbird/analytics/job/report/AssessmentMetricsJobV2.scala b/data-products/src/main/scala/org/sunbird/analytics/job/report/AssessmentMetricsJobV2.scala
@@ -136,7 +136,7 @@ object AssessmentMetricsJobV2 extends optional.Application with IJob with BaseRe
 
   def getUserData(spark: SparkSession, loadData: (SparkSession, Map[String, String], String, StructType) => DataFrame): DataFrame = {
     val schema = Encoders.product[UserData].schema
-    loadData(spark, Map("keys.pattern" -> "user:*","infer.schema" -> "true"), "org.apache.spark.sql.redis", schema)
+    loadData(spark, Map("keys.pattern" -> "user:*","infer.schema" -> "true", "key.column"-> "userid"), "org.apache.spark.sql.redis", schema)
       .withColumn("username",concat_ws(" ", col("firstname"), col("lastname")))
   }
 

diff --git a/data-products/src/main/scala/org/sunbird/analytics/job/report/CourseMetricsJobV2.scala b/data-products/src/main/scala/org/sunbird/analytics/job/report/CourseMetricsJobV2.scala
@@ -145,7 +145,7 @@ object CourseMetricsJobV2 extends optional.Application with IJob with ReportGene
 
   def getUserData(spark: SparkSession, loadData: (SparkSession, Map[String, String], String, StructType) => DataFrame): DataFrame = {
     val schema = Encoders.product[UserData].schema
-    loadData(spark, Map("keys.pattern" -> "user:*","infer.schema" -> "true"),"org.apache.spark.sql.redis", schema)
+    loadData(spark, Map("keys.pattern" -> "user:*","infer.schema" -> "true", "key.column"-> "userid"),"org.apache.spark.sql.redis", schema)
       .withColumn("username",concat_ws(" ", col("firstname"), col("lastname")))
   }
 

diff --git a/...products/src/test/scala/org/sunbird/analytics/job/report/TestAssessmentMetricsJobV2.scala b/...products/src/test/scala/org/sunbird/analytics/job/report/TestAssessmentMetricsJobV2.scala
@@ -112,7 +112,7 @@ class TestAssessmentMetricsJobV2 extends BaseReportSpec with MockFactory {
 
     val schema = Encoders.product[UserData].schema
     (reporterMock.loadData _)
-      .expects(spark, Map("keys.pattern" -> "user:*","infer.schema" -> "true"),"org.apache.spark.sql.redis", schema)
+      .expects(spark, Map("keys.pattern" -> "user:*","infer.schema" -> "true", "key.column"-> "userid"),"org.apache.spark.sql.redis", schema)
       .anyNumberOfTimes()
       .returning(userInfoDF)
 
@@ -145,7 +145,7 @@ class TestAssessmentMetricsJobV2 extends BaseReportSpec with MockFactory {
 
     val schema = Encoders.product[UserData].schema
     (reporterMock.loadData _)
-      .expects(spark, Map("keys.pattern" -> "user:*","infer.schema" -> "true"),"org.apache.spark.sql.redis", schema)
+      .expects(spark, Map("keys.pattern" -> "user:*","infer.schema" -> "true", "key.column"-> "userid"),"org.apache.spark.sql.redis", schema)
       .anyNumberOfTimes()
       .returning(userInfoDF)
 

diff --git a/data-products/src/test/scala/org/sunbird/analytics/job/report/TestCourseMetricsJobV2.scala b/data-products/src/test/scala/org/sunbird/analytics/job/report/TestCourseMetricsJobV2.scala
@@ -61,7 +61,7 @@ class TestCourseMetricsJobV2 extends BaseReportSpec with MockFactory with BaseRe
 
     val schema = Encoders.product[UserData].schema
     (reporterMock.loadData _)
-      .expects(spark, Map("keys.pattern" -> "user:*","infer.schema" -> "true"),"org.apache.spark.sql.redis", schema)
+      .expects(spark, Map("keys.pattern" -> "user:*","infer.schema" -> "true", "key.column"-> "userid"),"org.apache.spark.sql.redis", schema)
       .anyNumberOfTimes()
       .returning(userDF)