Unverified Commit ce7fdc66 authored by Pradyumna's avatar Pradyumna Committed by GitHub
Browse files

Merge pull request #345 from PradyumnaNagendra/release-3.8.0

Issue #000 fix: CourseBatch creation status issue fix
parents ace278e7 93a7f2de
master 4.0.0_RC4 4.1.0-loadtest-fixes SB-25890 SB-25890-1 bootcamp collection-csv 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-3.8.0 release-3.9.0 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 release-4.0.0_RC1 release-3.9.0_RC7 release-3.9.0_RC6 release-3.9.0_RC5 release-3.9.0_RC4 release-3.9.0_RC3 release-3.9.0_RC2 release-3.9.0_RC1 release-3.8.0_RC9 release-3.8.0_RC8 release-3.8.0_RC7
No related merge requests found
Showing with 1 addition and 18 deletions
+1 -18
......@@ -101,7 +101,7 @@ public class CourseBatchManagementActor extends BaseActor {
ResponseCode.invalidRequestParameter.getErrorMessage(), PARTICIPANTS));
}
CourseBatch courseBatch = JsonUtil.convert(request, CourseBatch.class);
courseBatch.setStatus(setCourseBatchStatus(actorMessage.getRequestContext(), (String) request.get(JsonKey.START_DATE)));
courseBatch.setStatus(ProgressStatus.NOT_STARTED.getValue());
String courseId = (String) request.get(JsonKey.COURSE_ID);
Map<String, Object> contentDetails = getContentDetails(actorMessage.getRequestContext(),courseId, headers);
courseBatch.setCreatedDate(ProjectUtil.getFormattedDate());
......@@ -336,23 +336,6 @@ public class CourseBatchManagementActor extends BaseActor {
InstructionEventGenerator.pushInstructionEvent(batchId, topic, data);
}
private int setCourseBatchStatus(RequestContext requestContext, String startDate) {
try {
Date todayDate = DATE_FORMAT.parse(DATE_FORMAT.format(new Date()));
Date requestedStartDate = DATE_FORMAT.parse(startDate);
logger.info(requestContext, "CourseBatchManagementActor:setCourseBatchStatus: todayDate="
+ todayDate + ", requestedStartDate=" + requestedStartDate);
if (todayDate.compareTo(requestedStartDate) == 0) {
return ProgressStatus.STARTED.getValue();
} else {
return ProgressStatus.NOT_STARTED.getValue();
}
} catch (ParseException e) {
logger.error(requestContext, "CourseBatchManagementActor:setCourseBatchStatus: Exception occurred with error message = " + e.getMessage(), e);
}
return ProgressStatus.NOT_STARTED.getValue();
}
private void validateMentors(CourseBatch courseBatch, String authToken, RequestContext requestContext) {
List<String> mentors = courseBatch.getMentors();
if (CollectionUtils.isNotEmpty(mentors)) {
......
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