Skip to content

Commit b28dc8e

Browse files
authored
refactor(data): handle removal of the learning event type (#2296)
2 parents dabf226 + 910b4e2 commit b28dc8e

1 file changed

Lines changed: 20 additions & 12 deletions

File tree

src/main/java/ai/elimu/util/csv/CsvAnalyticsExtractionHelper.java

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,11 @@ public static List<NumberLearningEvent> extractNumberLearningEvents(File csvFile
312312
numberLearningEvent.setAdditionalData(additionalData);
313313
}
314314

315-
if (StringUtils.isNotBlank(csvRecord.get("learning_event_type"))) {
316-
LearningEventType learningEventType = LearningEventType.valueOf(csvRecord.get("learning_event_type"));
317-
numberLearningEvent.setLearningEventType(learningEventType);
315+
if (versionCode < 4000033) {
316+
if (StringUtils.isNotBlank(csvRecord.get("learning_event_type"))) {
317+
LearningEventType learningEventType = LearningEventType.valueOf(csvRecord.get("learning_event_type"));
318+
numberLearningEvent.setLearningEventType(learningEventType);
319+
}
318320
}
319321

320322
if (versionCode >= 3005009) {
@@ -481,9 +483,11 @@ public static List<WordLearningEvent> extractWordLearningEvents(File csvFile) {
481483
String packageName = csvRecord.get("package_name");
482484
wordLearningEvent.setPackageName(packageName);
483485

484-
if (StringUtils.isNotBlank(csvRecord.get("learning_event_type"))) {
485-
LearningEventType learningEventType = LearningEventType.valueOf(csvRecord.get("learning_event_type"));
486-
wordLearningEvent.setLearningEventType(learningEventType);
486+
if (versionCode < 4000033) {
487+
if (StringUtils.isNotBlank(csvRecord.get("learning_event_type"))) {
488+
LearningEventType learningEventType = LearningEventType.valueOf(csvRecord.get("learning_event_type"));
489+
wordLearningEvent.setLearningEventType(learningEventType);
490+
}
487491
}
488492

489493
if (versionCode >= 3006000) {
@@ -568,9 +572,11 @@ public static List<StoryBookLearningEvent> extractStoryBookLearningEvents(File c
568572
String packageName = csvRecord.get("package_name");
569573
storyBookLearningEvent.setPackageName(packageName);
570574

571-
if (StringUtils.isNotBlank(csvRecord.get("learning_event_type"))) {
572-
LearningEventType learningEventType = LearningEventType.valueOf(csvRecord.get("learning_event_type"));
573-
storyBookLearningEvent.setLearningEventType(learningEventType);
575+
if (versionCode < 4000033) {
576+
if (StringUtils.isNotBlank(csvRecord.get("learning_event_type"))) {
577+
LearningEventType learningEventType = LearningEventType.valueOf(csvRecord.get("learning_event_type"));
578+
storyBookLearningEvent.setLearningEventType(learningEventType);
579+
}
574580
}
575581

576582
if (versionCode >= 3006000) {
@@ -653,9 +659,11 @@ public static List<VideoLearningEvent> extractVideoLearningEvents(File csvFile)
653659
String packageName = csvRecord.get("package_name");
654660
videoLearningEvent.setPackageName(packageName);
655661

656-
if (StringUtils.isNotBlank(csvRecord.get("learning_event_type"))) {
657-
LearningEventType learningEventType = LearningEventType.valueOf(csvRecord.get("learning_event_type"));
658-
videoLearningEvent.setLearningEventType(learningEventType);
662+
if (versionCode < 4000033) {
663+
if (StringUtils.isNotBlank(csvRecord.get("learning_event_type"))) {
664+
LearningEventType learningEventType = LearningEventType.valueOf(csvRecord.get("learning_event_type"));
665+
videoLearningEvent.setLearningEventType(learningEventType);
666+
}
659667
}
660668

661669
String additionalData = csvRecord.get("additional_data");

0 commit comments

Comments
 (0)