updated

Author: revanthkumarJ

core/model/src/commonMain/kotlin/com/mifos/core/model/objects/runreport/DataRow.kt

@@ -12,10 +12,85 @@ package com.mifos.core.model.objects.runreport
 import com.mifos.core.model.utils.Parcelable
 import com.mifos.core.model.utils.Parcelize
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.builtins.nullable
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.mapSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.JsonNull
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.boolean
+import kotlinx.serialization.json.booleanOrNull
+import kotlinx.serialization.json.contentOrNull
+import kotlinx.serialization.json.double
+import kotlinx.serialization.json.doubleOrNull
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 
 /**
  * Created by Tarun on 03-08-17.
  */
 @Parcelize
 @Serializable
-data class DataRow(var row: List<String?> = listOf()) : Parcelable
+data class DataRow(
+    @Serializable(with = RowDeserializer::class)
+    val row: List<String?> = emptyList()
+) : Parcelable
+
+object RowDeserializer : KSerializer<List<String?>> {
+
+    @OptIn(ExperimentalSerializationApi::class)
+    override val descriptor: SerialDescriptor =
+        ListSerializer(String.serializer().nullable).descriptor
+
+    override fun deserialize(decoder: Decoder): List<String?> {
+        val jsonElement = (decoder as? JsonDecoder)?.decodeJsonElement()
+            ?: throw SerializationException("Decoder is not a JsonDecoder")
+
+        return read(jsonElement)
+    }
+
+    private fun read(jsonElement: JsonElement): List<String?> {
+        return when (jsonElement) {
+            is JsonArray -> {
+                jsonElement.map { element ->
+                    when (element) {
+                        is JsonPrimitive -> element.contentOrNull
+                        is JsonArray -> element.joinToString("-") {
+                            it.jsonPrimitive.content
+                        }
+                        else -> element.toString()
+                    }
+                }
+            }
+
+            else -> throw SerializationException("Expected JsonArray, got $jsonElement")
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: List<String?>) {
+        if (encoder !is JsonEncoder) {
+            throw SerializationException("This serializer can only be used with Json")
+        }
+
+        val jsonArray = JsonArray(value.map {
+            when {
+                it == null -> JsonNull
+                else -> JsonPrimitive(it)
+            }
+        })
+
+        encoder.encodeJsonElement(jsonArray)
+    }
+}

feature/report/src/commonMain/kotlin/com/mifos/feature/report/reportDetail/ReportDetailViewModel.kt

@@ -137,7 +137,13 @@ class ReportDetailViewModel(
 
     fun fetchRunReportWithQuery(reportName: String, options: MutableMap<String, String>) =
         viewModelScope.launch {
+            Logger.e("Revanth input"){
+                options.toString()
+            }
             getRunReportWithQueryUseCase(reportName, options).collect { result ->
+                Logger.e("Revanth result"){
+                    result.toString()
+                }
                 when (result) {
                     is DataState.Error ->
                         _reportDetailUiState.value =