4.8.4 bug fixes (#67)

* bug #99529 bug #99530 (#63) * Fix for batch create issue due to column type change * Fix for parse issue in enrol API --------- Co-authored-by: Sahil-tarento <140611066+Sahil-tarento@users.noreply.github.com> Co-authored-by: SaipradeepR <53404427+SaipradeepR@users.noreply.github.com> Co-authored-by: saipradeep_ravipati <saipradeep.ravipati@tarento.com>
sunbird-cb · Aug 24, 2023 · 9eeac62 · 9eeac62
1 parent 2642889
commit 9eeac62
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 3 deletions.
diff --git a/...mon/src/main/java/org/sunbird/learner/actors/coursebatch/dao/impl/CourseBatchDaoImpl.java b/...mon/src/main/java/org/sunbird/learner/actors/coursebatch/dao/impl/CourseBatchDaoImpl.java
@@ -33,6 +33,7 @@ public class CourseBatchDaoImpl implements CourseBatchDao {
   public Response create(RequestContext requestContext, CourseBatch courseBatch) {
     Map<String, Object> map = CourseBatchUtil.cassandraCourseMapping(courseBatch, dateFormat);
     map = CassandraUtil.changeCassandraColumnMapping(map);
+    CassandraUtil.convertMaptoJsonString(map, JsonKey.BATCH_ATTRIBUTES_KEY);
     return cassandraOperation.insertRecord(
             requestContext, courseBatchDb.getKeySpace(), courseBatchDb.getTableName(), map);
   }

diff --git a/...se-mw/course-actors-common/src/main/java/org/sunbird/models/course/batch/CourseBatch.java b/...se-mw/course-actors-common/src/main/java/org/sunbird/models/course/batch/CourseBatch.java
@@ -2,6 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -223,4 +226,13 @@ public void setBatchAttributes(Map<String, Object> batchAttributes) {
     this.batchAttributes = batchAttributes;
   }
 
+  public void setBatchAttributes(String batchAttributesStr) {
+    try {
+      this.batchAttributes = (new ObjectMapper()).readValue(batchAttributesStr,
+          new TypeReference<Map<String, Object>>() {
+          });
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
 }
diff --git a/.../sunbird-util/sunbird-cassandra-utils/src/main/java/org/sunbird/common/CassandraUtil.java b/.../sunbird-util/sunbird-cassandra-utils/src/main/java/org/sunbird/common/CassandraUtil.java
@@ -18,6 +18,9 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.sunbird.cassandraannotation.ClusteringKey;
 import org.sunbird.cassandraannotation.PartitioningKey;
 import org.sunbird.common.exception.ProjectCommonException;
@@ -347,4 +350,15 @@ public static Map<String, Object> changeCassandraColumnMapping(Map<String, Objec
     map.entrySet().forEach(entry -> newMap.put(propertiesCache.readPropertyValue(entry.getKey()), entry.getValue()));
     return newMap;
   }
+
+  public static void convertMaptoJsonString(Map<String, Object> map, String field) {
+    try {
+      if (map.containsKey(field)) {
+        map.put(field, (new ObjectMapper()).writeValueAsString(map.get(field)));
+      }
+    } catch (JsonProcessingException e) {
+      logger.error(null,"Exception occurred - convertMaptoJsonString", e);
+      throw new RuntimeException(e);
+    }
+  }
 }
diff --git a/...nbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java b/...nbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java
@@ -1081,5 +1081,8 @@ public final class JsonKey {
   public static final String CURRENT_BATCH_SIZE = "currentBatchSize";
   public static final String PRIMARYCATEGORY = "primaryCategory";
   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";
+
   private JsonKey() {}
 }
diff --git a/...util/sunbird-platform-core/common-util/src/main/resources/cassandratablecolumn.properties b/...util/sunbird-platform-core/common-util/src/main/resources/cassandratablecolumn.properties
@@ -262,4 +262,5 @@ last_access_time=lastAccessTime
 last_completed_time=lastCompletedTime
 last_updated_time=lastUpdatedTime
 cert_templates=certTemplates
-batchattributes=batchAttributes
+batch_attributes=batchAttributes
+batchAttributes=batch_attributes
diff --git a/...ird-util/sunbird-platform-core/common-util/src/main/resources/externalresource.properties b/...ird-util/sunbird-platform-core/common-util/src/main/resources/externalresource.properties
@@ -206,3 +206,4 @@ sunbird_api_mgr_base_url=https://dev.sunbirded.org/api
 enrollment_list_size=1000
 sunbird_course_batch_path=/app/toc/{courseId}/overview?batchId={batchId}
 enrolment_list_include_retired_courses=false
+enrol_end_date_allow_lesser_value=true
diff --git a/service/app/controllers/coursemanagement/validator/CourseBatchRequestValidator.java b/service/app/controllers/coursemanagement/validator/CourseBatchRequestValidator.java
@@ -13,6 +13,7 @@
 import org.sunbird.common.models.util.JsonKey;
 import org.sunbird.common.models.util.ProjectLogger;
 import org.sunbird.common.models.util.ProjectUtil;
+import org.sunbird.common.models.util.PropertiesCache;
 import org.sunbird.common.request.BaseRequestValidator;
 import org.sunbird.common.request.Request;
 import org.sunbird.common.responsecode.ResponseCode;
@@ -171,7 +172,7 @@ private static void validateEndDate(String startDate, String endDate) {
           ResponseCode.dateFormatError.getErrorMessage(),
           ResponseCode.CLIENT_ERROR.getResponseCode());
     }
-    if (StringUtils.isNotEmpty(endDate) && batchStartDate.getTime() >= batchEndDate.getTime()) {
+    if (StringUtils.isNotEmpty(endDate) && batchStartDate.getTime() > batchEndDate.getTime()) {
       throw new ProjectCommonException(
           ResponseCode.endDateError.getErrorCode(),
           ResponseCode.endDateError.getErrorMessage(),
@@ -201,7 +202,7 @@ private static void validateEnrollmentEndDate(
           ResponseCode.dateFormatError.getErrorMessage(),
           ResponseCode.CLIENT_ERROR.getResponseCode());
     }
-    if (StringUtils.isNotEmpty(enrollmentEndDate)
+    if (courseBatchEnrolLessDateEnabled() && StringUtils.isNotEmpty(enrollmentEndDate)
         && batchStartDate.getTime() > batchenrollmentEndDate.getTime()) {
       throw new ProjectCommonException(
           ResponseCode.enrollmentEndDateStartError.getErrorCode(),
@@ -339,4 +340,10 @@ public void validateGetParticipantsRequest(Request request) {
             ResponseCode.mandatoryParamsMissing,
             JsonKey.BATCH_ID);
   }
+
+  private static boolean courseBatchEnrolLessDateEnabled() {
+    return Boolean.parseBoolean(
+            PropertiesCache.getInstance()
+                    .getProperty(JsonKey.COURSE_BATCH_ENROLL_END_DATE_LESS));
+  }
 }