Cbrelease 4.8.0 (#39) (#40)

* changed logic to update batch lookup table Co-authored-by: vikrantbipin <118338417+vikrantbipin@users.noreply.github.com>
sunbird-cb · May 17, 2023 · 8340454 · 8340454
1 parent 5c23fa6
commit 8340454
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ommon/src/main/java/org/sunbird/learner/actors/coursebatch/dao/impl/BatchUserDaoImpl.java b/...ommon/src/main/java/org/sunbird/learner/actors/coursebatch/dao/impl/BatchUserDaoImpl.java
@@ -85,8 +85,7 @@ public Response updateBatchLookupRecord(RequestContext requestContext, String ba
         primaryKey.put(JsonKey.USER_ID, userId);
         primaryKey.put(JsonKey.ENROLLED_DATE, map.get("enrolled_date"));
         Map<String, Object> attributeMap = new HashMap<>();
-        attributeMap.putAll(activeStatus);
-        attributeMap.remove(JsonKey.BATCH_ID);
+        attributeMap.put(JsonKey.ACTIVE, activeStatus.get(JsonKey.ACTIVE));
         attributeMap = CassandraUtil.changeCassandraColumnMapping(attributeMap);
         return cassandraOperation.updateRecord(
                 requestContext, KEYSPACE_NAME, ENROLLMENT_BATCH, attributeMap, primaryKey);

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
@@ -232,7 +232,7 @@ class CourseEnrolmentActor @Inject()(@Named("course-batch-notification-actor") c
         // code for  find root cause of null value in prod(16-02-2023)
         try {
             val activeStatus = dataMap.get(JsonKey.ACTIVE);
-            logger.info(requestContext, "upsertEnrollment :: IsNew :: " + isNew + " ActiveStatus :: " + activeStatus + " DataMap is :: " + dataMap)
+            logger.info(requestContext, "upsertEnrollment :: IsNew :: " + isNew + " ActiveStatus :: " + activeStatus + " DataMap is :: " + dataMap+ " DataBatchMap:: "+ dataBatchMap)
             if (activeStatus == null) {
                 throw new Exception("Active Value is null in upsertEnrollment");
             }