From 6d7a3c8e1899ee2507fca17330f17e24880c2cfb Mon Sep 17 00:00:00 2001 From: Varsha Mahuli Date: Tue, 16 Apr 2024 17:38:24 +0530 Subject: [PATCH] date to datetime fix in warehouse fields --- .../analytics/dashboard/report/user/UserReportModel.scala | 2 +- .../dashboard/report/warehouse/DataWarehouseModel.scala | 2 +- 2 files changed, 2 insertions(+), 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 index 502f4e40..fcf382c9 100644 --- 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/batch-models/src/main/scala/org/ekstep/analytics/dashboard/report/warehouse/DataWarehouseModel.scala b/batch-models/src/main/scala/org/ekstep/analytics/dashboard/report/warehouse/DataWarehouseModel.scala index 645de02b..d15c50c5 100644 --- a/batch-models/src/main/scala/org/ekstep/analytics/dashboard/report/warehouse/DataWarehouseModel.scala +++ b/batch-models/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)