Merge pull request #23 from Nivetha-M/cbrelease-4.0.1

Content Progress fix
sunbird-cb · Apr 20, 2022 · 0c3a7d3 · 0c3a7d3
2 parents 0928720 + f86b136
commit 0c3a7d3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...se-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ContentConsumptionActor.scala b/...se-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ContentConsumptionActor.scala
@@ -376,8 +376,8 @@ class ContentConsumptionActor @Inject() extends BaseEnrolmentActor {
                 ProjectUtil.removeUnwantedFields(m, JsonKey.DATE_TIME, JsonKey.USER_ID, JsonKey.ADDED_BY, JsonKey.LAST_UPDATED_TIME, JsonKey.OLD_LAST_ACCESS_TIME, JsonKey.OLD_LAST_UPDATED_TIME, JsonKey.OLD_LAST_COMPLETED_TIME)
                 m.put(JsonKey.COLLECTION_ID, m.getOrDefault(JsonKey.COURSE_ID, ""))
 		jsonFields.foreach(field =>
-                    if(fields.contains(field))
-                        m.put(field, mapper.readTree((m.getOrDefault(field, "")).asInstanceOf[String]))
+                    if(fields.contains(field) && m.get(field) != null)
+                        m.put(field, mapper.readTree(m.get(field).asInstanceOf[String]))
                 )
                 val formattedMap = JsonUtil.convertWithDateFormat(m, classOf[util.Map[String, Object]], dateFormatter)
                 if (fields.contains(JsonKey.ASSESSMENT_SCORE))