fix: json column being saved as a stringified Kotlin object (#24)

monta-app · Sep 10, 2024 · b77d023 · b77d023
1 parent c389894
commit b77d023
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/common/src/jvmMain/kotlin/com/monta/ocpp/emulator/common/util/JsonColumnType.kt b/common/src/jvmMain/kotlin/com/monta/ocpp/emulator/common/util/JsonColumnType.kt
@@ -50,7 +50,7 @@ class JsonColumnType<T : Any>(
     @Suppress("UNCHECKED_CAST")
     override fun valueFromDB(value: Any): T {
         return when (value) {
-            is ByteArray -> parse(String(value).unescapeSqlJsonString())
+            is ByteArray -> parse(value.decodeToString().unescapeSqlJsonString())
             else -> value as T
         }
     }
@@ -69,6 +69,13 @@ class JsonColumnType<T : Any>(
             value
         }
     }
+
+    override fun notNullValueToDB(value: T): Any = stringify(value)
+
+    override fun valueToString(value: T?): String = when (value) {
+        is Iterable<*> -> nonNullValueToString(value)
+        else -> super.valueToString(value)
+    }
 }
 
 /**