feat: include research experiment data in csv exports

pom-dependency-tree.txt

@@ -1,4 +1,4 @@
-ai.elimu:webapp:war:2.6.65-SNAPSHOT
+ai.elimu:webapp:war:2.6.66-SNAPSHOT
 +- ai.elimu:model:jar:model-2.0.113:compile
 |  \- com.google.code.gson:gson:jar:2.13.1:compile
 |     \- com.google.errorprone:error_prone_annotations:jar:2.38.0:compile

src/main/config/centos-stream-9/opt/jetty-base/webapps/webapp-HIN.xml

@@ -41,6 +41,10 @@
     <Arg>discord_webhook_url</Arg>
     <Arg>**********</Arg>
   </Call>
+  <Call name="setAttribute">
+    <Arg>discord_analytics_webhook_url</Arg>
+    <Arg>**********</Arg>
+  </Call>
   <Call name="setAttribute">
     <Arg>github_lfs_token</Arg>
     <Arg>**********</Arg>

src/main/config/centos-stream-9/opt/jetty-base/webapps/webapp-TGL.xml

@@ -41,6 +41,10 @@
     <Arg>discord_webhook_url</Arg>
     <Arg>**********</Arg>
   </Call>
+  <Call name="setAttribute">
+    <Arg>discord_analytics_webhook_url</Arg>
+    <Arg>**********</Arg>
+  </Call>
   <Call name="setAttribute">
     <Arg>github_lfs_token</Arg>
     <Arg>**********</Arg>

src/main/config/centos-stream-9/opt/jetty-base/webapps/webapp-THA.xml

@@ -41,6 +41,10 @@
     <Arg>discord_webhook_url</Arg>
     <Arg>**********</Arg>
   </Call>
+  <Call name="setAttribute">
+    <Arg>discord_analytics_webhook_url</Arg>
+    <Arg>**********</Arg>
+  </Call>
   <Call name="setAttribute">
     <Arg>github_lfs_token</Arg>
     <Arg>**********</Arg>

src/main/config/centos-stream-9/opt/jetty-base/webapps/webapp-VIE.xml

@@ -41,6 +41,10 @@
     <Arg>discord_webhook_url</Arg>
     <Arg>**********</Arg>
   </Call>
+  <Call name="setAttribute">
+    <Arg>discord_analytics_webhook_url</Arg>
+    <Arg>**********</Arg>
+  </Call>
   <Call name="setAttribute">
     <Arg>github_lfs_token</Arg>
     <Arg>**********</Arg>

src/main/config/centos-stream-9/opt/jetty-base/webapps/webapp.xml

@@ -41,6 +41,10 @@
     <Arg>discord_webhook_url</Arg>
     <Arg>**********</Arg>
   </Call>
+  <Call name="setAttribute">
+    <Arg>discord_analytics_webhook_url</Arg>
+    <Arg>**********</Arg>
+  </Call>
   <Call name="setAttribute">
     <Arg>github_lfs_token</Arg>
     <Arg>**********</Arg>

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

@@ -50,25 +50,25 @@ public void handleRequest(
             "mastery_score",
             "time_spent_ms",
             "additional_data",
+            "research_experiment",
+            "experiment_group",
             "letter_sound_letters",
             "letter_sound_sounds",
             "letter_sound_id"
-        )
-        .build();
-
+        ).build();
     StringWriter stringWriter = new StringWriter();
     CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
-
     for (LetterSoundAssessmentEvent letterSoundAssessmentEvent : letterSoundAssessmentEvents) {
       log.info("letterSoundAssessmentEvent.getId(): " + letterSoundAssessmentEvent.getId());
-
       csvPrinter.printRecord(
           letterSoundAssessmentEvent.getId(),
           letterSoundAssessmentEvent.getTimestamp().getTimeInMillis() / 1_000,
           letterSoundAssessmentEvent.getPackageName(),
           letterSoundAssessmentEvent.getMasteryScore(),
           letterSoundAssessmentEvent.getTimeSpentMs(),
           letterSoundAssessmentEvent.getAdditionalData(),
+          letterSoundAssessmentEvent.getResearchExperiment().ordinal(),
+          letterSoundAssessmentEvent.getExperimentGroup().ordinal(),
           letterSoundAssessmentEvent.getLetterSoundLetters(),
           letterSoundAssessmentEvent.getLetterSoundSounds(),
           letterSoundAssessmentEvent.getLetterSoundId()
@@ -78,7 +78,6 @@ public void handleRequest(
     csvPrinter.close();
 
     String csvFileContent = stringWriter.toString();
-
     response.setContentType("text/csv");
     byte[] bytes = csvFileContent.getBytes();
     response.setContentLength(bytes.length);

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

@@ -47,34 +47,33 @@ public void handleRequest(
             "id",
             "timestamp",
             "package_name",
+            "additional_data",
+            "research_experiment",
+            "experiment_group",
             // "letter_sound_letters",
             // "letter_sound_sounds",
-            "letter_sound_id",
-            "additional_data"
-        )
-        .build();
-
+            "letter_sound_id"
+        ).build();
     StringWriter stringWriter = new StringWriter();
     CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
-
     for (LetterSoundLearningEvent letterSoundLearningEvent : letterSoundLearningEvents) {
       log.info("letterSoundLearningEvent.getId(): " + letterSoundLearningEvent.getId());
-
       csvPrinter.printRecord(
           letterSoundLearningEvent.getId(),
           letterSoundLearningEvent.getTimestamp().getTimeInMillis() / 1_000,
           letterSoundLearningEvent.getPackageName(),
+          letterSoundLearningEvent.getAdditionalData(),
+          letterSoundLearningEvent.getResearchExperiment().ordinal(),
+          letterSoundLearningEvent.getExperimentGroup().ordinal(),
           // letterSoundLearningEvent.getLetterSoundLetters(),
           // letterSoundLearningEvent.getLetterSoundSounds(),
-          letterSoundLearningEvent.getLetterSoundId(),
-          letterSoundLearningEvent.getAdditionalData()
+          letterSoundLearningEvent.getLetterSoundId()
       );
     }
     csvPrinter.flush();
     csvPrinter.close();
 
     String csvFileContent = stringWriter.toString();
-
     response.setContentType("text/csv");
     byte[] bytes = csvFileContent.getBytes();
     response.setContentLength(bytes.length);

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

@@ -47,36 +47,35 @@ public void handleRequest(
             "id",
             "timestamp",
             "package_name",
+            "learning_event_type",
             "additional_data",
+            "research_experiment",
+            "experiment_group",
             "number_value",
             "number_symbol",
-            "number_id",
-            "learning_event_type"
-        )
-        .build();
-
+            "number_id"
+        ).build();
     StringWriter stringWriter = new StringWriter();
     CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
-
     for (NumberLearningEvent numberLearningEvent : numberLearningEvents) {
       log.info("numberLearningEvent.getId(): " + numberLearningEvent.getId());
-
       csvPrinter.printRecord(
           numberLearningEvent.getId(),
           numberLearningEvent.getTimestamp().getTimeInMillis() / 1_000,
           numberLearningEvent.getPackageName(),
+          numberLearningEvent.getLearningEventType(),
           numberLearningEvent.getAdditionalData(),
+          numberLearningEvent.getResearchExperiment().ordinal(),
+          numberLearningEvent.getExperimentGroup().ordinal(),
           numberLearningEvent.getNumberValue(),
           numberLearningEvent.getNumberSymbol(),
-          numberLearningEvent.getNumberId(),
-          numberLearningEvent.getLearningEventType()
+          numberLearningEvent.getNumberId()
       );
     }
     csvPrinter.flush();
     csvPrinter.close();
 
     String csvFileContent = stringWriter.toString();
-
     response.setContentType("text/csv");
     byte[] bytes = csvFileContent.getBytes();
     response.setContentLength(bytes.length);

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

@@ -51,34 +51,33 @@ public void handleRequest(
             "id",
             "timestamp",
             "package_name",
-            "storybook_title",
-            "storybook_id",
             "learning_event_type",
-            "additional_data"
-        )
-        .build();
-
+            "additional_data",
+            "research_experiment",
+            "experiment_group",
+            "storybook_title",
+            "storybook_id"
+        ).build();
     StringWriter stringWriter = new StringWriter();
     CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
-
     for (StoryBookLearningEvent storyBookLearningEvent : storyBookLearningEvents) {
       log.info("storyBookLearningEvent.getId(): " + storyBookLearningEvent.getId());
-
       csvPrinter.printRecord(
           storyBookLearningEvent.getId(),
           storyBookLearningEvent.getTimestamp().getTimeInMillis() / 1_000,
           storyBookLearningEvent.getPackageName(),
-          storyBookLearningEvent.getStoryBookTitle(),
-          storyBookLearningEvent.getStoryBookId(),
           storyBookLearningEvent.getLearningEventType(),
-          storyBookLearningEvent.getAdditionalData()
+          storyBookLearningEvent.getAdditionalData(),
+          storyBookLearningEvent.getResearchExperiment().ordinal(),
+          storyBookLearningEvent.getExperimentGroup().ordinal(),
+          storyBookLearningEvent.getStoryBookTitle(),
+          storyBookLearningEvent.getStoryBookId()
       );
     }
     csvPrinter.flush();
     csvPrinter.close();
 
     String csvFileContent = stringWriter.toString();
-
     response.setContentType("text/csv");
     byte[] bytes = csvFileContent.getBytes();
     response.setContentLength(bytes.length);

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

@@ -1,8 +1,6 @@
 package ai.elimu.web.analytics.students;
 
-import ai.elimu.dao.StoryBookLearningEventDao;
 import ai.elimu.dao.StudentDao;
-import ai.elimu.dao.WordLearningEventDao;
 import ai.elimu.entity.analytics.students.Student;
 import ai.elimu.util.AnalyticsHelper;
 import lombok.RequiredArgsConstructor;

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

@@ -41,15 +41,11 @@ public void handleRequest(
         .setHeader(
             "id",
             "android_id"
-        )
-        .build();
-
+        ).build();
     StringWriter stringWriter = new StringWriter();
     CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
-
     for (Student student : students) {
       log.info("student.getId(): " + student.getId());
-
       csvPrinter.printRecord(
           student.getId(),
           student.getAndroidId()
@@ -59,7 +55,6 @@ public void handleRequest(
     csvPrinter.close();
 
     String csvFileContent = stringWriter.toString();
-
     response.setContentType("text/csv");
     byte[] bytes = csvFileContent.getBytes();
     response.setContentLength(bytes.length);

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

@@ -52,34 +52,33 @@ public void handleRequest(
             "id",
             "timestamp",
             "package_name",
-            "video_title",
-            "video_id",
             "learning_event_type",
-            "additional_data"
-        )
-        .build();
-
+            "additional_data",
+            "research_experiment",
+            "experiment_group",
+            "video_title",
+            "video_id"
+        ).build();
     StringWriter stringWriter = new StringWriter();
     CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
-
     for (VideoLearningEvent videoLearningEvent : videoLearningEvents) {
       log.info("videoLearningEvent.getId(): " + videoLearningEvent.getId());
-
       csvPrinter.printRecord(
           videoLearningEvent.getId(),
           videoLearningEvent.getTimestamp().getTimeInMillis() / 1_000,
           videoLearningEvent.getPackageName(),
-          videoLearningEvent.getVideoTitle(),
-          videoLearningEvent.getVideoId(),
           videoLearningEvent.getLearningEventType(),
-          videoLearningEvent.getAdditionalData()
+          videoLearningEvent.getAdditionalData(),
+          videoLearningEvent.getResearchExperiment().ordinal(),
+          videoLearningEvent.getExperimentGroup().ordinal(),
+          videoLearningEvent.getVideoTitle(),
+          videoLearningEvent.getVideoId()
       );
-      csvPrinter.flush();
     }
+    csvPrinter.flush();
     csvPrinter.close();
 
     String csvFileContent = stringWriter.toString();
-
     response.setContentType("text/csv");
     byte[] bytes = csvFileContent.getBytes();
     response.setContentLength(bytes.length);

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

@@ -50,24 +50,24 @@ public void handleRequest(
             "mastery_score",
             "time_spent_ms",
             "additional_data",
+            "research_experiment",
+            "experiment_group",
             "word_text",
             "word_id"
-        )
-        .build();
-
+        ).build();
     StringWriter stringWriter = new StringWriter();
     CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
-
     for (WordAssessmentEvent wordAssessmentEvent : wordAssessmentEvents) {
       log.info("wordAssessmentEvent.getId(): " + wordAssessmentEvent.getId());
-
       csvPrinter.printRecord(
           wordAssessmentEvent.getId(),
           wordAssessmentEvent.getTimestamp().getTimeInMillis() / 1_000,
           wordAssessmentEvent.getPackageName(),
           wordAssessmentEvent.getMasteryScore(),
           wordAssessmentEvent.getTimeSpentMs(),
           wordAssessmentEvent.getAdditionalData(),
+          wordAssessmentEvent.getResearchExperiment().ordinal(),
+          wordAssessmentEvent.getExperimentGroup().ordinal(),
           wordAssessmentEvent.getWordText(),
           wordAssessmentEvent.getWordId()
       );
@@ -76,7 +76,6 @@ public void handleRequest(
     csvPrinter.close();
 
     String csvFileContent = stringWriter.toString();
-
     response.setContentType("text/csv");
     byte[] bytes = csvFileContent.getBytes();
     response.setContentLength(bytes.length);