fixed Notification model

Author: heart

app/build.gradle

@@ -33,11 +33,12 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
 }

pam-android-kotlin/src/main/java/ai/pams/android/kotlin/api/NotificationAPI.kt

@@ -63,10 +63,7 @@ class NotificationAPI {
                     url = endpoint,
                     queryString = queryString
                 ) { result, _ ->
-                    val model = createGson().fromJson(result, NotificationList::class.java)
-                    model.items?.forEach {
-                        it.parseFlex(context)
-                    }
+                    val model = NotificationList.parse(result, context);
                     CoroutineScope(Dispatchers.Main).launch {
                         callBack?.invoke(model.items ?: listOf())
                     }

pam-android-kotlin/src/main/java/ai/pams/android/kotlin/models/notification/NotificationIist.kt

@@ -1,7 +1,79 @@
 package ai.pams.android.kotlin.models.notification
 
-import com.google.gson.annotations.SerializedName
+import android.content.Context
+import android.os.Build
+import androidx.annotation.RequiresApi
+import org.json.JSONObject
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.time.LocalDateTime
+import java.util.*
 
 class NotificationList(
-    @SerializedName("items") val items: List<NotificationItem>? = null
-)
+    var items: List<NotificationItem>? = null
+){
+    companion object{
+
+        private fun stringToDate(dateString: String): Date? {
+            val format = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)
+            try {
+                return format.parse(dateString)
+            } catch (e: ParseException) {
+                e.printStackTrace()
+            }
+            return null
+        }
+
+        fun parse(jsonString: String?, context: Context): NotificationList{
+            if(jsonString == null){
+                val noti = NotificationList()
+                noti.items = listOf()
+                return noti
+            }
+
+            val noti = NotificationList();
+            val list = mutableListOf<NotificationItem>()
+
+            val json = JSONObject(jsonString)
+            val itemsArray = json.optJSONArray("items")
+            val count = itemsArray?.length() ?: 0
+            for(i in 0 until count){
+                itemsArray?.getJSONObject(i)?.let{  jsonItem->
+
+                    val createdDate = jsonItem.optString("created_date")
+
+                    var jsonPayload = jsonItem.optJSONObject("json_data");
+                    jsonPayload = jsonPayload?.optJSONObject("pam")
+                    val payload = mutableMapOf<String, Any>()
+
+                    val iterator = jsonPayload?.keys()
+                    while(iterator?.hasNext() == true){
+                        val key = iterator.next()
+                        jsonPayload?.get(key)?.let{ data ->
+                            payload[key] = data
+                        }
+                    }
+
+                    val item = NotificationItem(
+                        date = stringToDate(createdDate),
+                        deliverId = jsonItem.optString("deliver_id"),
+                        description = jsonItem.optString("description"),
+                        flex = jsonItem.optString("flex"),
+                        isOpen = jsonItem.optBoolean("is_open"),
+                        payload = payload,
+                        pixel = jsonItem.optString("pixel"),
+                        thumbnailUrl = jsonItem.optString("thumbnail_url"),
+                        title = jsonItem.optString("title"),
+                        url = jsonItem.optString("title"),
+                        popupType = jsonPayload?.optString("popupType")
+                    )
+                    item.parseFlex(context)
+                    list.add(item)
+                }
+            }
+
+            noti.items = list
+            return noti
+        }
+    }
+}

pam-android-kotlin/src/main/java/ai/pams/android/kotlin/models/notification/NotificationItem.kt

@@ -9,27 +9,16 @@ import com.google.gson.annotations.SerializedName
 import java.util.*
 
 data class NotificationItem(
-    @SerializedName("created_date")
-    val date: Date? = null,
-    @SerializedName("deliver_id")
+    var date: Date? = null,
     val deliverId: String? = null,
-    @SerializedName("description")
     val description: String? = null,
-    @SerializedName("flex")
     val flex: String? = null,
-    @SerializedName("is_open")
     val isOpen: Boolean? = null,
-    @SerializedName("json_data")
-    val payload: Payload? = null,
-    @SerializedName("pixel")
+    val payload: Map<String, Any>? = null,
     val pixel: String? = null,
-    @SerializedName("thumbnail_url")
     val thumbnailUrl: String? = null,
-    @SerializedName("title")
     val title: String? = null,
-    @SerializedName("url")
     val url: String? = null,
-    @SerializedName("popupType")
     val popupType: String? = null,
 ) {
     var bannerUrl: String? = null