refactor: assessment event parent class

Author: jo-elimu

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

@@ -125,12 +125,6 @@ public static List<WordAssessmentEvent> extractWordAssessmentEvents(File csvFile
                 String packageName = csvRecord.get("package_name");
                 wordAssessmentEvent.setPackageName(packageName);
 
-                String wordText = csvRecord.get("word_text");
-                wordAssessmentEvent.setWordText(wordText);
-
-                Long wordId = Long.valueOf(csvRecord.get("word_id"));
-                wordAssessmentEvent.setWordId(wordId);
-
                 Float masteryScore = Float.valueOf(csvRecord.get("mastery_score"));
                 wordAssessmentEvent.setMasteryScore(masteryScore);
 
@@ -140,6 +134,12 @@ public static List<WordAssessmentEvent> extractWordAssessmentEvents(File csvFile
                 // String additionalData = csvRecord.get("additional_data");
                 // wordAssessmentEvent.setAdditionalData(additionalData);
 
+                String wordText = csvRecord.get("word_text");
+                wordAssessmentEvent.setWordText(wordText);
+
+                Long wordId = Long.valueOf(csvRecord.get("word_id"));
+                wordAssessmentEvent.setWordId(wordId);
+
                 wordAssessmentEvents.add(wordAssessmentEvent);
             }
             csvParser.close();

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

@@ -47,11 +47,11 @@ public void handleRequest(
             "id",
             "timestamp",
             "package_name",
-            "word_text",
-            "word_id",
             "mastery_score",
             "time_spent_ms",
-            "additional_data"
+            "additional_data",
+            "word_text",
+            "word_id"
         )
         .build();
 
@@ -65,11 +65,11 @@ public void handleRequest(
           wordAssessmentEvent.getId(),
           wordAssessmentEvent.getTimestamp().getTimeInMillis(),
           wordAssessmentEvent.getPackageName(),
-          wordAssessmentEvent.getWordText(),
-          wordAssessmentEvent.getWordId(),
           wordAssessmentEvent.getMasteryScore(),
           wordAssessmentEvent.getTimeSpentMs(),
-          wordAssessmentEvent.getAdditionalData()
+          wordAssessmentEvent.getAdditionalData(),
+          wordAssessmentEvent.getWordText(),
+          wordAssessmentEvent.getWordId()
       );
     }
     csvPrinter.flush();