Skip to content

Commit b75d278

Browse files
committed
fix: handle nullpointer during csv exports
#2280
1 parent 5d87c97 commit b75d278

7 files changed

Lines changed: 70 additions & 70 deletions

src/main/java/ai/elimu/web/analytics/students/LetterSoundAssessmentEventsCsvExportController.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,20 @@ public void handleRequest(
6161
).build();
6262
StringWriter stringWriter = new StringWriter();
6363
CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
64-
for (LetterSoundAssessmentEvent letterSoundAssessmentEvent : letterSoundAssessmentEvents) {
65-
log.info("letterSoundAssessmentEvent.getId(): " + letterSoundAssessmentEvent.getId());
64+
for (LetterSoundAssessmentEvent event : letterSoundAssessmentEvents) {
65+
log.info("event.getId(): " + event.getId());
6666
csvPrinter.printRecord(
67-
letterSoundAssessmentEvent.getId(),
68-
letterSoundAssessmentEvent.getTimestamp().getTimeInMillis() / 1_000,
69-
letterSoundAssessmentEvent.getPackageName(),
70-
letterSoundAssessmentEvent.getMasteryScore(),
71-
letterSoundAssessmentEvent.getTimeSpentMs(),
72-
letterSoundAssessmentEvent.getAdditionalData(),
73-
letterSoundAssessmentEvent.getResearchExperiment().ordinal(),
74-
letterSoundAssessmentEvent.getExperimentGroup().ordinal(),
75-
letterSoundAssessmentEvent.getLetterSoundLetters(),
76-
letterSoundAssessmentEvent.getLetterSoundSounds(),
77-
letterSoundAssessmentEvent.getLetterSoundId()
67+
event.getId(),
68+
event.getTimestamp().getTimeInMillis() / 1_000,
69+
event.getPackageName(),
70+
event.getMasteryScore(),
71+
event.getTimeSpentMs(),
72+
event.getAdditionalData(),
73+
(event.getResearchExperiment() != null) ? event.getResearchExperiment().ordinal() : null,
74+
(event.getExperimentGroup() != null) ? event.getExperimentGroup().ordinal() : null,
75+
event.getLetterSoundLetters(),
76+
event.getLetterSoundSounds(),
77+
event.getLetterSoundId()
7878
);
7979
}
8080
csvPrinter.flush();

src/main/java/ai/elimu/web/analytics/students/LetterSoundLearningEventsCsvExportController.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@ public void handleRequest(
6060
).build();
6161
StringWriter stringWriter = new StringWriter();
6262
CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
63-
for (LetterSoundLearningEvent letterSoundLearningEvent : letterSoundLearningEvents) {
64-
log.info("letterSoundLearningEvent.getId(): " + letterSoundLearningEvent.getId());
63+
for (LetterSoundLearningEvent event : letterSoundLearningEvents) {
64+
log.info("event.getId(): " + event.getId());
6565
csvPrinter.printRecord(
66-
letterSoundLearningEvent.getId(),
67-
letterSoundLearningEvent.getTimestamp().getTimeInMillis() / 1_000,
68-
letterSoundLearningEvent.getPackageName(),
69-
letterSoundLearningEvent.getAdditionalData(),
70-
letterSoundLearningEvent.getResearchExperiment().ordinal(),
71-
letterSoundLearningEvent.getExperimentGroup().ordinal(),
66+
event.getId(),
67+
event.getTimestamp().getTimeInMillis() / 1_000,
68+
event.getPackageName(),
69+
event.getAdditionalData(),
70+
(event.getResearchExperiment() != null) ? event.getResearchExperiment().ordinal() : null,
71+
(event.getExperimentGroup() != null) ? event.getExperimentGroup().ordinal() : null,
7272
// letterSoundLearningEvent.getLetterSoundLetters(),
7373
// letterSoundLearningEvent.getLetterSoundSounds(),
74-
letterSoundLearningEvent.getLetterSoundId()
74+
event.getLetterSoundId()
7575
);
7676
}
7777
csvPrinter.flush();

src/main/java/ai/elimu/web/analytics/students/NumberLearningEventsCsvExportController.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@ public void handleRequest(
6161
).build();
6262
StringWriter stringWriter = new StringWriter();
6363
CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
64-
for (NumberLearningEvent numberLearningEvent : numberLearningEvents) {
65-
log.info("numberLearningEvent.getId(): " + numberLearningEvent.getId());
64+
for (NumberLearningEvent event : numberLearningEvents) {
65+
log.info("event.getId(): " + event.getId());
6666
csvPrinter.printRecord(
67-
numberLearningEvent.getId(),
68-
numberLearningEvent.getTimestamp().getTimeInMillis() / 1_000,
69-
numberLearningEvent.getPackageName(),
70-
numberLearningEvent.getLearningEventType(),
71-
numberLearningEvent.getAdditionalData(),
72-
numberLearningEvent.getResearchExperiment().ordinal(),
73-
numberLearningEvent.getExperimentGroup().ordinal(),
74-
numberLearningEvent.getNumberValue(),
75-
numberLearningEvent.getNumberSymbol(),
76-
numberLearningEvent.getNumberId()
67+
event.getId(),
68+
event.getTimestamp().getTimeInMillis() / 1_000,
69+
event.getPackageName(),
70+
event.getLearningEventType(),
71+
event.getAdditionalData(),
72+
(event.getResearchExperiment() != null) ? event.getResearchExperiment().ordinal() : null,
73+
(event.getExperimentGroup() != null) ? event.getExperimentGroup().ordinal() : null,
74+
event.getNumberValue(),
75+
event.getNumberSymbol(),
76+
event.getNumberId()
7777
);
7878
}
7979
csvPrinter.flush();

src/main/java/ai/elimu/web/analytics/students/StoryBookLearningEventsCsvExportController.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,18 @@ public void handleRequest(
6464
).build();
6565
StringWriter stringWriter = new StringWriter();
6666
CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
67-
for (StoryBookLearningEvent storyBookLearningEvent : storyBookLearningEvents) {
68-
log.info("storyBookLearningEvent.getId(): " + storyBookLearningEvent.getId());
67+
for (StoryBookLearningEvent event : storyBookLearningEvents) {
68+
log.info("event.getId(): " + event.getId());
6969
csvPrinter.printRecord(
70-
storyBookLearningEvent.getId(),
71-
storyBookLearningEvent.getTimestamp().getTimeInMillis() / 1_000,
72-
storyBookLearningEvent.getPackageName(),
73-
storyBookLearningEvent.getLearningEventType(),
74-
storyBookLearningEvent.getAdditionalData(),
75-
storyBookLearningEvent.getResearchExperiment().ordinal(),
76-
storyBookLearningEvent.getExperimentGroup().ordinal(),
77-
storyBookLearningEvent.getStoryBookTitle(),
78-
storyBookLearningEvent.getStoryBookId()
70+
event.getId(),
71+
event.getTimestamp().getTimeInMillis() / 1_000,
72+
event.getPackageName(),
73+
event.getLearningEventType(),
74+
event.getAdditionalData(),
75+
(event.getResearchExperiment() != null) ? event.getResearchExperiment().ordinal() : null,
76+
(event.getExperimentGroup() != null) ? event.getExperimentGroup().ordinal() : null,
77+
event.getStoryBookTitle(),
78+
event.getStoryBookId()
7979
);
8080
}
8181
csvPrinter.flush();

src/main/java/ai/elimu/web/analytics/students/VideoLearningEventsCsvExportController.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,18 @@ public void handleRequest(
6565
).build();
6666
StringWriter stringWriter = new StringWriter();
6767
CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
68-
for (VideoLearningEvent videoLearningEvent : videoLearningEvents) {
69-
log.info("videoLearningEvent.getId(): " + videoLearningEvent.getId());
68+
for (VideoLearningEvent event : videoLearningEvents) {
69+
log.info("event.getId(): " + event.getId());
7070
csvPrinter.printRecord(
71-
videoLearningEvent.getId(),
72-
videoLearningEvent.getTimestamp().getTimeInMillis() / 1_000,
73-
videoLearningEvent.getPackageName(),
74-
videoLearningEvent.getLearningEventType(),
75-
videoLearningEvent.getAdditionalData(),
76-
videoLearningEvent.getResearchExperiment().ordinal(),
77-
videoLearningEvent.getExperimentGroup().ordinal(),
78-
videoLearningEvent.getVideoTitle(),
79-
videoLearningEvent.getVideoId()
71+
event.getId(),
72+
event.getTimestamp().getTimeInMillis() / 1_000,
73+
event.getPackageName(),
74+
event.getLearningEventType(),
75+
event.getAdditionalData(),
76+
(event.getResearchExperiment() != null) ? event.getResearchExperiment().ordinal() : null,
77+
(event.getExperimentGroup() != null) ? event.getExperimentGroup().ordinal() : null,
78+
event.getVideoTitle(),
79+
event.getVideoId()
8080
);
8181
}
8282
csvPrinter.flush();

src/main/java/ai/elimu/web/analytics/students/WordAssessmentEventsCsvExportController.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@ public void handleRequest(
6161
).build();
6262
StringWriter stringWriter = new StringWriter();
6363
CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
64-
for (WordAssessmentEvent wordAssessmentEvent : wordAssessmentEvents) {
65-
log.info("wordAssessmentEvent.getId(): " + wordAssessmentEvent.getId());
64+
for (WordAssessmentEvent event : wordAssessmentEvents) {
65+
log.info("event.getId(): " + event.getId());
6666
csvPrinter.printRecord(
67-
wordAssessmentEvent.getId(),
68-
wordAssessmentEvent.getTimestamp().getTimeInMillis() / 1_000,
69-
wordAssessmentEvent.getPackageName(),
70-
wordAssessmentEvent.getMasteryScore(),
71-
wordAssessmentEvent.getTimeSpentMs(),
72-
wordAssessmentEvent.getAdditionalData(),
73-
wordAssessmentEvent.getResearchExperiment().ordinal(),
74-
wordAssessmentEvent.getExperimentGroup().ordinal(),
75-
wordAssessmentEvent.getWordText(),
76-
wordAssessmentEvent.getWordId()
67+
event.getId(),
68+
event.getTimestamp().getTimeInMillis() / 1_000,
69+
event.getPackageName(),
70+
event.getMasteryScore(),
71+
event.getTimeSpentMs(),
72+
event.getAdditionalData(),
73+
(event.getResearchExperiment() != null) ? event.getResearchExperiment().ordinal() : null,
74+
(event.getExperimentGroup() != null) ? event.getExperimentGroup().ordinal() : null,
75+
event.getWordText(),
76+
event.getWordId()
7777
);
7878
}
7979
csvPrinter.flush();

src/main/java/ai/elimu/web/analytics/students/WordLearningEventsCsvExportController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public void handleRequest(
6060
).build();
6161
StringWriter stringWriter = new StringWriter();
6262
CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
63-
for (WordLearningEvent wordLearningEvent : wordLearningEvents) {
64-
log.info("wordLearningEvent.getId(): " + wordLearningEvent.getId());
63+
for (WordLearningEvent event : wordLearningEvents) {
64+
log.info("event.getId(): " + event.getId());
6565
csvPrinter.printRecord(
6666
wordLearningEvent.getId(),
6767
wordLearningEvent.getTimestamp().getTimeInMillis() / 1_000,

0 commit comments

Comments
 (0)