Merge pull request #286 from niharikasingh84/SB-13975-End_Date_Fix

Sb 13975 end date fix
Sunbird-Lern · Jul 26, 2019 · c39fcbf · c39fcbf
2 parents 014ab68 + f1b4125
commit c39fcbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...mmon/src/main/java/org/sunbird/learner/actors/coursebatch/CourseBatchManagementActor.java b/...mmon/src/main/java/org/sunbird/learner/actors/coursebatch/CourseBatchManagementActor.java
@@ -673,8 +673,7 @@ private void updateCourseBatchDate(CourseBatch courseBatch, Map<String, Object>
         requestedStartDate != null
             ? (String) req.get(JsonKey.START_DATE)
             : courseBatch.getStartDate());
-    courseBatch.setEndDate(
-        requestedEndDate != null ? (String) req.get(JsonKey.END_DATE) : courseBatch.getEndDate());
+    courseBatch.setEndDate(requestedEndDate == null ? null : (String) req.get(JsonKey.END_DATE));
     courseBatch.setEnrollmentEndDate(
         requestedEnrollmentEndDate == null ? null : (String) req.get(JsonKey.ENROLLMENT_END_DATE));
   }

diff --git a/...nbird-lms-mw/actors/common/src/main/java/org/sunbird/models/course/batch/CourseBatch.java b/...nbird-lms-mw/actors/common/src/main/java/org/sunbird/models/course/batch/CourseBatch.java
@@ -26,6 +26,8 @@ public class CourseBatch implements Serializable {
   private String createdDate;
   private List<String> createdFor;
   private String description;
+
+  @JsonInclude(JsonInclude.Include.ALWAYS)
   private String endDate;
 
   @JsonInclude(JsonInclude.Include.ALWAYS)