date to datetime fix in warehouse fields

sunbird-cb · Apr 16, 2024 · 6d7a3c8 · 6d7a3c8
1 parent 10d48e1
commit 6d7a3c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/batch-models/src/main/scala/org/ekstep/analytics/dashboard/report/user/UserReportModel.scala b/batch-models/src/main/scala/org/ekstep/analytics/dashboard/report/user/UserReportModel.scala
@@ -86,7 +86,7 @@ object UserReportModel extends AbsDashboardModel {
         col("Tag").alias("tag"),
         col("userVerified").alias("is_verified_karmayogi"),
         //from_unixtime(col("userCreatedTimestamp"), "dd/MM/yyyy").alias("user_registration_date"),
-        date_format(col("userCreatedTimestamp"), "dd/MM/yyyy HH:mm:ss a").alias("user_registration_date"),
+        date_format(from_unixtime(col("userCreatedTimestamp")), "dd/MM/yyyy HH:mm:ss a").alias("user_registration_date"),
         col("role").alias("roles"),
         col("personalDetails.gender").alias("gender"),
         col("personalDetails.category").alias("category"),

diff --git a/...s/src/main/scala/org/ekstep/analytics/dashboard/report/warehouse/DataWarehouseModel.scala b/...s/src/main/scala/org/ekstep/analytics/dashboard/report/warehouse/DataWarehouseModel.scala
@@ -26,7 +26,7 @@ object DataWarehouseModel extends AbsDashboardModel {
     var user_details = spark.read.option("header", "true")
       .csv(s"${conf.localReportDir}/${conf.userReportPath}/${today}-warehouse")
     //user_details = user_details.withColumn("user_registration_date", to_date(col("user_registration_date"), "dd/MM/yyyy"))
-    user_details = user_details.withColumn("user_registration_date", date_format(col("userCreatedTimestamp"), "dd/MM/yyyy HH:mm:ss a"))
+    user_details = user_details.withColumn("user_registration_date", date_format(col("user_registration_date"), "dd/MM/yyyy HH:mm:ss a"))
 
 
     truncateWarehouseTable(conf.dwUserTable)