Model 2.0.117 (#2312)

Author: jo-elimu

pom-dependency-tree.txt

@@ -1,5 +1,5 @@
-ai.elimu:webapp:war:2.6.107-SNAPSHOT
-+- ai.elimu:model:jar:model-2.0.114:compile
+ai.elimu:webapp:war:2.6.108-SNAPSHOT
++- ai.elimu:model:jar:model-2.0.117:compile
 |  \- com.google.code.gson:gson:jar:2.13.1:compile
 |     \- com.google.errorprone:error_prone_annotations:jar:2.38.0:compile
 +- org.springframework:spring-context:jar:6.0.11:compile

pom.xml

@@ -9,7 +9,7 @@
   <properties>
     <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <model.version>2.0.114</model.version>
+    <model.version>2.0.117</model.version>
     <hibernate.version>6.1.7.Final</hibernate.version>
     <jetty.version>11.0.24</jetty.version>
     <spring.version>6.0.11</spring.version>

src/main/java/ai/elimu/entity/analytics/LetterSoundLearningEvent.java

@@ -1,8 +1,13 @@
 package ai.elimu.entity.analytics;
 
+import java.util.List;
+
 import ai.elimu.entity.content.LetterSound;
+import ai.elimu.entity.converters.StringListConverter;
+import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,13 +16,27 @@
 @Entity
 public class LetterSoundLearningEvent extends LearningEvent {
 
-  /**
-   * This field might not be included, e.g. if the letter-sound correspondence was learned 
-   * in a 3rd-party app that did not load the content from the elimu.ai Content Provider. 
-   * In this case, the {@link #letterSoundId} will be {@code null}.
-   */
-  private Long letterSoundId;
+    /**
+     * The sequence of letters. E.g. <code>["s","h"]</code>.
+     */
+    @NotNull
+    @Convert(converter = StringListConverter.class)
+    private List<String> letterSoundLetters;
+
+    /**
+     * The sequence of sounds (IPA values). E.g. <code>["ʃ"]</code>.
+     */
+    @NotNull
+    @Convert(converter = StringListConverter.class)
+    private List<String> letterSoundSounds;
+
+    /**
+     * This field might not be included, e.g. if the assessment task was done in a 
+     * 3rd-party app that did not load the content from the elimu.ai Content Provider. 
+     * In that case, this field will be {@code null}.
+     */
+    private Long letterSoundId;
 
-  @ManyToOne
-  private LetterSound letterSound;
+    @ManyToOne
+    private LetterSound letterSound;
 }

src/main/java/ai/elimu/entity/converters/StringListConverter.java

@@ -0,0 +1,21 @@
+package ai.elimu.entity.converters;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import jakarta.persistence.AttributeConverter;
+
+public class StringListConverter implements AttributeConverter<List<String>, String> {
+    private static final String SPLIT_CHAR = ";";
+
+    @Override
+    public String convertToDatabaseColumn(List<String> stringList) {
+        return stringList != null ? String.join(SPLIT_CHAR, stringList) : "";
+    }
+
+    @Override
+    public List<String> convertToEntityAttribute(String string) {
+        return string != null ? Arrays.asList(string.split(SPLIT_CHAR)) : Collections.emptyList();
+    }
+}

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

@@ -181,9 +181,9 @@ public static List<LetterSoundLearningEvent> extractLetterSoundLearningEvents(Fi
                     }
                 }
 
-                // TODO: letterSoundLetters
+                // TODO: letter_sound_letters
 
-                // TODO: letterSoundSounds
+                // TODO: letter_sound_sounds
 
                 Long letterSoundId = Long.valueOf(csvRecord.get("letter_sound_id"));
                 letterSoundLearningEvent.setLetterSoundId(letterSoundId);

src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java

@@ -380,6 +380,8 @@ private void populateDatabase(WebApplicationContext webApplicationContext) {
                         letterSoundLearningEvent.setResearchExperiment(ResearchExperiment.EXP_0_WORD_EMOJIS);
                         letterSoundLearningEvent.setExperimentGroup(ExperimentGroup.values()[(int) (Math.random() * 2)]);
                     }
+                    letterSoundLearningEvent.setLetterSoundLetters(letterSoundM.getLetters().stream().map(Letter::getText).toList());
+                    letterSoundLearningEvent.setLetterSoundSounds(letterSoundM.getSounds().stream().map(Sound::getValueIpa).toList());
                     letterSoundLearningEvent.setLetterSoundId(letterSoundM.getId());
                     letterSoundLearningEventDao.create(letterSoundLearningEvent);
                 }

src/main/resources/META-INF/jpa-schema-export.sql

@@ -672,6 +672,8 @@
         researchExperiment smallint,
         timestamp datetime,
         letterSoundId bigint,
+        letterSoundLetters varchar(255),
+        letterSoundSounds varchar(255),
         application_id bigint,
         letterSound_id bigint,
         primary key (id)

src/main/webapp/WEB-INF/jsp/analytics/students/id.jsp

@@ -227,7 +227,8 @@
             <thead>
                 <th>timestamp</th>
                 <th>package_name</th>
-                <th>letter_sound_id</th>
+                <th>letter_sound_letters</th>
+                <th>letter_sound_sounds</th>
                 <th>ℹ️</th>
             </thead>
             <tbody>
@@ -241,7 +242,10 @@
                             <code>${letterSoundLearningEvent.packageName}</code>
                         </td>
                         <td>
-                            ${letterSoundLearningEvent.letterSoundId}
+                            ${letterSoundLearningEvent.letterSoundLetters}
+                        </td>
+                        <td>
+                            ${letterSoundLearningEvent.letterSoundSounds}
                         </td>
                         <td>
                             <code>${letterSoundLearningEvent.additionalData}</code>