Merge pull request #98 from project-sunbird/SB-5980

Issue #SB-5980 feat:endDate validation while updating course batch
Sunbird-Lern · Aug 2, 2018 · 2a3cef4 · 2a3cef4
2 parents 8844016 + d96a7c2
commit 2a3cef4
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/common-util/src/main/java/org/sunbird/common/request/RequestValidator.java b/common-util/src/main/java/org/sunbird/common/request/RequestValidator.java
@@ -604,10 +604,7 @@ private static void validateUpdateBatchEndDate(Request request) {
     String startDate = (String) request.getRequest().get(JsonKey.START_DATE);
     String endDate = (String) request.getRequest().get(JsonKey.END_DATE);
     format.setLenient(false);
-    if (request.getRequest().containsKey(JsonKey.END_DATE)
-        && StringUtils.isNotEmpty(startDate)
-        && request.getRequest().containsKey(JsonKey.START_DATE)
-        && !StringUtils.isBlank(startDate)) {
+    if (StringUtils.isNotBlank(endDate) && StringUtils.isNotBlank(startDate)) {
       Date batchStartDate = null;
       Date batchEndDate = null;
       try {