Unverified Commit 37edc14b authored by Mahesh Kumar Gangula's avatar Mahesh Kumar Gangula Committed by GitHub
Browse files

Merge pull request #369 from PradyumnaNagendra/release-4.0.0

SB-24659 fix: Fixed missing cert_templates in ES on batchUpdate
parents 9ec0e50d 26b91ae3
master 4.0.0_RC4 4.1.0-loadtest-fixes SB-25890 SB-25890-1 bootcamp dependabot/maven/course-mw/course-actors-common/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/course-actors-common/org.postgresql-postgresql-42.4.1 dependabot/maven/course-mw/enrolment-actor/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-cassandra-utils/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-notification/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-platform-core/actor-core/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-platform-core/actor-util/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-platform-core/auth-verifier/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-platform-core/common-util/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/course-mw/sunbird-util/sunbird-platform-core/common-util/org.apache.kafka-kafka-clients-0.10.2.2 dependabot/maven/service/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 helmchart release-4.0.0 release-4.1.0 release-4.2.0 release-4.4.0 release-4.5.0 release-4.6.0 release-4.8.0 release-4.9.0 release-5.0.0 release-5.0.1 release-5.0.2 release-5.1.0 release-5.2.0 release-5.2.1 release-5.3.0 release-5.3.1 release-5.4.0 release-5.3.1_RC1 release-5.3.0_RC1 release-5.2.0_RC2 release-5.2.0_RC1 release-5.1.0_RC2 release-5.1.0_RC1 release-5.0.1_RC3 release-5.0.1_RC2 release-5.0.1_RC1 release-5.0.0_RC6 release-5.0.0_RC5 release-5.0.0_RC4 release-5.0.0_RC3 release-5.0.0_RC2 release-5.0.0_RC1 release-4.9.0_RC4 release-4.9.0_RC3 release-4.9.0_RC2 release-4.9.0_RC1 release-4.8.0_RC2 release-4.8.0_RC1 release-4.6.0_RC10 release-4.6.0_RC9 release-4.6.0_RC8 release-4.6.0_RC7 release-4.6.0_RC6 release-4.6.0_RC5 release-4.6.0_RC4 release-4.6.0_RC3 release-4.6.0_RC2 release-4.6.0_RC1 release-4.5.0_RC4 release-4.5.0_RC3 release-4.5.0_RC2 release-4.5.0_RC1 release-4.4.0_RC3 release-4.4.0_RC2 release-4.4.0_RC1 release-4.2.0_RC1 release-4.1.0_RC4 release-4.1.0_RC3 release-4.1.0_RC2 release-4.1.0_RC1 release-4.0.0_RC7 release-4.0.0_RC6 release-4.0.0_RC5 release-4.0.0_RC4 release-4.0.0_RC3 release-4.0.0_RC2
No related merge requests found
Showing with 8 additions and 1 deletion
+8 -1
......@@ -388,6 +388,12 @@ public class CourseBatchManagementActor extends BaseActor {
validateBatchStartAndEndDate(
dbBatchStartDate, dbBatchEndDate, requestedStartDate, requestedEndDate, todayDate);
/* Update the batch to In-Progress for below conditions
* 1. StartDate is greater than or equal to today's date
* 2. EndDate can be either NULL or
* EndDate can be greater than or equal to today's date or
* EndDate can be greater than or equal to existing EndDate
* */
Boolean batchStarted = (null != requestedStartDate && todayDate.compareTo(requestedStartDate) >=0)
&& ((null == requestedEndDate)
|| (null != requestedEndDate && null == dbBatchEndDate && todayDate.compareTo(requestedEndDate) <= 0)
......
......@@ -259,4 +259,5 @@ updated_date=updatedDate
enrolled_date=enrolledDate
last_access_time=lastAccessTime
last_completed_time=lastCompletedTime
last_updated_time=lastUpdatedTime
\ No newline at end of file
last_updated_time=lastUpdatedTime
cert_templates=certTemplates
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment