refactor: move assessment event fields to parent class

pom-dependency-tree.txt

@@ -1,7 +1,7 @@
-ai.elimu:webapp:war:2.6.44-SNAPSHOT
-+- ai.elimu:model:jar:model-2.0.97:compile
-|  \- com.google.code.gson:gson:jar:2.13.0:compile
-|     \- com.google.errorprone:error_prone_annotations:jar:2.37.0:compile
+ai.elimu:webapp:war:2.6.47-SNAPSHOT
++- ai.elimu:model:jar:model-2.0.111: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.9:compile
 |  +- org.springframework:spring-aop:jar:6.0.9:compile
 |  +- org.springframework:spring-beans:jar:6.0.9: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.97</model.version>
+    <model.version>2.0.111</model.version>
     <hibernate.version>6.1.7.Final</hibernate.version>
     <jetty.version>11.0.24</jetty.version>
     <spring.version>6.0.9</spring.version>

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

@@ -44,12 +44,23 @@ public abstract class AssessmentEvent extends BaseEntity {
   @ManyToOne
   private Application application;
 
+  /**
+   * A value in the range [0.0, 1.0].
+   */
+  private Float masteryScore;
+
+  /**
+   * The number of milliseconds passed between the student opening the assessment task 
+   * and submitting a response. E.g. <code>15000</code>.
+   */
+  private Long timeSpentMs;
+
   /**
    * Any additional data should be stored in the format of a JSON object.
    * 
    * Example:
    * <pre>
-   * {'word_ids_presented': [1,2,3], 'word_id_selected': 2}
+   * {'word_ids_presented': [1,2,3], 'word_id_selected': [2]}
    * </pre>
    */
   @Column(length = 1024)

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

@@ -25,15 +25,4 @@ public class LetterSoundAssessmentEvent extends AssessmentEvent {
      * In this case, the {@link #letterSoundId} will be {@code null}.
      */
     private Long letterSoundId;
-
-    /**
-     * A value in the range [0.0, 1.0].
-     */
-    private Float masteryScore;
-
-    /**
-     * The number of milliseconds passed between the student opening the assessment task 
-     * and submitting a response. E.g. <code>15000</code>.
-     */
-    private Long timeSpentMs;
 }

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

@@ -20,15 +20,4 @@ public class WordAssessmentEvent extends AssessmentEvent {
      * In this case, the {@link #wordId} will be {@code null}.
      */
     private Long wordId;
-
-    /**
-     * A value in the range [0.0, 1.0].
-     */
-    private Float masteryScore;
-
-    /**
-     * The number of milliseconds passed between the student opening the assessment task 
-     * and submitting a response. E.g. <code>15000</code>.
-     */
-    private Long timeSpentMs;
 }

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

@@ -312,13 +312,13 @@
        id bigint not null auto_increment,
         additionalData text,
         androidId varchar(255),
+        masteryScore float(23),
         packageName varchar(255),
+        timeSpentMs bigint,
         timestamp datetime,
         letterSoundId bigint,
         letterSoundLetters varchar(255),
         letterSoundSounds varchar(255),
-        masteryScore float(23),
-        timeSpentMs bigint,
         application_id bigint,
         primary key (id)
     ) type=MyISAM;
@@ -610,10 +610,10 @@
        id bigint not null auto_increment,
         additionalData text,
         androidId varchar(255),
-        packageName varchar(255),
-        timestamp datetime,
         masteryScore float(23),
+        packageName varchar(255),
         timeSpentMs bigint,
+        timestamp datetime,
         wordId bigint,
         wordText varchar(255),
         application_id bigint,