Merge pull request #401 from elimu-ai/additional-data-null

jo-elimu · web-flow · commit 4053985efa46 · 2025-07-18T14:48:33.000+07:00
fix: allow null value for additional data
diff --git a/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToLetterSoundAssessmentEventGsonConverter.kt b/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToLetterSoundAssessmentEventGsonConverter.kt
@@ -68,7 +68,7 @@ object CursorToLetterSoundAssessmentEventGsonConverter {
         val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)
         val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)
         if (columnAdditionalData != -1) {
-            val additionalData: String = cursor.getString(columnAdditionalData)
+            val additionalData: String? = cursor.getString(columnAdditionalData)
             Log.i(TAG, "additionalData: \"${additionalData}\"")
             letterSoundAssessmentEventGson.additionalData = additionalData
         }
diff --git a/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToNumberAssessmentEventGsonConverter.kt b/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToNumberAssessmentEventGsonConverter.kt
@@ -64,7 +64,7 @@ object CursorToNumberAssessmentEventGsonConverter {
         val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)
         val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)
         if (columnAdditionalData != -1) {
-            val additionalData: String = cursor.getString(columnAdditionalData)
+            val additionalData: String? = cursor.getString(columnAdditionalData)
             Log.i(this::class.simpleName, "additionalData: ${additionalData}")
             numberAssessmentEventGson.additionalData = additionalData
         }
diff --git a/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToNumberLearningEventGsonConverter.kt b/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToNumberLearningEventGsonConverter.kt
@@ -50,7 +50,7 @@ object CursorToNumberLearningEventGsonConverter {
         val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)
         val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)
         if (columnAdditionalData != -1) {
-            val additionalData = cursor.getString(columnAdditionalData)
+            val additionalData: String? = cursor.getString(columnAdditionalData)
             Log.i(TAG, "additionalData: $additionalData")
             numberLearningEventGson.additionalData = additionalData
         }
diff --git a/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToVideoLearningEventGsonConverter.kt b/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToVideoLearningEventGsonConverter.kt
@@ -54,7 +54,7 @@ object CursorToVideoLearningEventGsonConverter {
         val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)
         val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)
         if (columnAdditionalData != -1) {
-            val additionalData = cursor.getString(columnAdditionalData)
+            val additionalData: String? = cursor.getString(columnAdditionalData)
             Log.i(TAG, "additionalData: $additionalData")
             videoLearningEventGson.additionalData = additionalData
         }
diff --git a/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToWordAssessmentEventGsonConverter.kt b/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToWordAssessmentEventGsonConverter.kt
@@ -66,7 +66,7 @@ object CursorToWordAssessmentEventGsonConverter {
         val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)
         val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)
         if (columnAdditionalData != -1) {
-            val additionalData: String = cursor.getString(columnAdditionalData)
+            val additionalData: String? = cursor.getString(columnAdditionalData)
             Log.i(TAG, "additionalData: \"${additionalData}\"")
             wordAssessmentEventGson.additionalData = additionalData
         }
diff --git a/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToWordLearningEventGsonConverter.kt b/utils/src/main/java/ai/elimu/analytics/utils/converter/CursorToWordLearningEventGsonConverter.kt
@@ -54,7 +54,7 @@ object CursorToWordLearningEventGsonConverter {
         val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)
         val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)
         if (columnAdditionalData != -1) {
-            val additionalData = cursor.getString(columnAdditionalData)
+            val additionalData: String? = cursor.getString(columnAdditionalData)
             Log.i(TAG, "additionalData: " + additionalData)
             wordLearningEventGson.additionalData = additionalData
         }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ object CursorToLetterSoundAssessmentEventGsonConverter {`
`68`	`68`	`val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)`
`69`	`69`	`val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)`
`70`	`70`	`if (columnAdditionalData != -1) {`
`71`		`- val additionalData: String = cursor.getString(columnAdditionalData)`
	`71`	`+ val additionalData: String? = cursor.getString(columnAdditionalData)`
`72`	`72`	`Log.i(TAG, "additionalData: \"${additionalData}\"")`
`73`	`73`	`letterSoundAssessmentEventGson.additionalData = additionalData`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ object CursorToNumberAssessmentEventGsonConverter {`
`64`	`64`	`val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)`
`65`	`65`	`val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)`
`66`	`66`	`if (columnAdditionalData != -1) {`
`67`		`- val additionalData: String = cursor.getString(columnAdditionalData)`
	`67`	`+ val additionalData: String? = cursor.getString(columnAdditionalData)`
`68`	`68`	`Log.i(this::class.simpleName, "additionalData: ${additionalData}")`
`69`	`69`	`numberAssessmentEventGson.additionalData = additionalData`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ object CursorToNumberLearningEventGsonConverter {`
`50`	`50`	`val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)`
`51`	`51`	`val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)`
`52`	`52`	`if (columnAdditionalData != -1) {`
`53`		`- val additionalData = cursor.getString(columnAdditionalData)`
	`53`	`+ val additionalData: String? = cursor.getString(columnAdditionalData)`
`54`	`54`	`Log.i(TAG, "additionalData: $additionalData")`
`55`	`55`	`numberLearningEventGson.additionalData = additionalData`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ object CursorToVideoLearningEventGsonConverter {`
`54`	`54`	`val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)`
`55`	`55`	`val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)`
`56`	`56`	`if (columnAdditionalData != -1) {`
`57`		`- val additionalData = cursor.getString(columnAdditionalData)`
	`57`	`+ val additionalData: String? = cursor.getString(columnAdditionalData)`
`58`	`58`	`Log.i(TAG, "additionalData: $additionalData")`
`59`	`59`	`videoLearningEventGson.additionalData = additionalData`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ object CursorToWordAssessmentEventGsonConverter {`
`66`	`66`	`val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)`
`67`	`67`	`val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)`
`68`	`68`	`if (columnAdditionalData != -1) {`
`69`		`- val additionalData: String = cursor.getString(columnAdditionalData)`
	`69`	`+ val additionalData: String? = cursor.getString(columnAdditionalData)`
`70`	`70`	`Log.i(TAG, "additionalData: \"${additionalData}\"")`
`71`	`71`	`wordAssessmentEventGson.additionalData = additionalData`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ object CursorToWordLearningEventGsonConverter {`
`54`	`54`	`val columnNameAdditionalData = bundle.getString(BundleKeys.KEY_ADDITIONAL_DATA)`
`55`	`55`	`val columnAdditionalData: Int = cursor.getColumnIndex(columnNameAdditionalData)`
`56`	`56`	`if (columnAdditionalData != -1) {`
`57`		`- val additionalData = cursor.getString(columnAdditionalData)`
	`57`	`+ val additionalData: String? = cursor.getString(columnAdditionalData)`
`58`	`58`	`Log.i(TAG, "additionalData: " + additionalData)`
`59`	`59`	`wordLearningEventGson.additionalData = additionalData`
`60`	`60`	`}`