From c4a216d0aa6ae7cf768515138fc66ffe51fa1ed6 Mon Sep 17 00:00:00 2001 From: sreeragksgh Date: Mon, 18 Sep 2023 17:18:44 +0530 Subject: [PATCH] Fix to show retired courses in enrolment list API through param flag --- .../org/sunbird/enrolments/CourseEnrolmentActor.scala | 10 ++++++++-- .../java/org/sunbird/common/models/util/JsonKey.java | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/CourseEnrolmentActor.scala b/course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/CourseEnrolmentActor.scala index 1164f30d3..22fb45be6 100644 --- a/course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/CourseEnrolmentActor.scala +++ b/course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/CourseEnrolmentActor.scala @@ -44,8 +44,7 @@ class CourseEnrolmentActor @Inject()(@Named("course-batch-notification-actor") c var userCoursesDao: UserCoursesDao = new UserCoursesDaoImpl() var batchUserDao : BatchUserDao = new BatchUserDaoImpl() var groupDao: GroupDaoImpl = new GroupDaoImpl() - val isRetiredCoursesIncludedInEnrolList = if (StringUtils.isNotBlank(ProjectUtil.getConfigValue("enrolment_list_include_retired_courses"))) - (ProjectUtil.getConfigValue("enrolment_list_include_retired_courses")).toBoolean else false + var isRetiredCoursesIncludedInEnrolList = false val isCacheEnabled = if (StringUtils.isNotBlank(ProjectUtil.getConfigValue("user_enrolments_response_cache_enable"))) (ProjectUtil.getConfigValue("user_enrolments_response_cache_enable")).toBoolean else true val ttl: Int = if (StringUtils.isNotBlank(ProjectUtil.getConfigValue("user_enrolments_response_cache_ttl"))) @@ -126,6 +125,13 @@ class CourseEnrolmentActor @Inject()(@Named("course-batch-notification-actor") c def list(request: Request): Unit = { val userId = request.get(JsonKey.USER_ID).asInstanceOf[String] + val urlQueryString = request.getContext.get(JsonKey.URL_QUERY_STRING).asInstanceOf[String] + val paramMap = urlQueryString + .split("&") + .map(_.split("=")) + .collect { case Array(key, value) => key -> value } + .toMap + isRetiredCoursesIncludedInEnrolList = paramMap.getOrElse(JsonKey.RETIRED_COURE_ENABLED, JsonKey.FALSE).toBoolean val courseIdList = request.get(JsonKey.COURSE_IDS).asInstanceOf[java.util.List[String]] logger.info(request.getRequestContext,"CourseEnrolmentActor :: list :: UserId = " + userId) try{ diff --git a/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java b/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java index 82dbb1cc5..68aba7cfa 100644 --- a/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java +++ b/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java @@ -1083,6 +1083,8 @@ public final class JsonKey { public static final String PRIMARY_CATEGORY_BLENDED_PROGRAM = "Blended Program"; public static final String COURSE_BATCH_ENROLL_END_DATE_LESS = "enrol_end_date_allow_lesser_value"; public static final String BATCH_ATTRIBUTES_KEY = "batch_attributes"; - + public static final String RETIRED_COURE_ENABLED = "retiredCoursesEnabled"; + public static final String FALSE = "false"; + private JsonKey() {} }