fix(push-payload): map 'u' and 'message_id' to notificationData and p…

…ass them to the eventHandler SUITEDEV-35736 Co-authored-by: davidSchuppa <[email protected]> Co-authored-by: LasOri <[email protected]> Co-authored-by: matusekma <[email protected]>
emartech · May 7, 2024 · 3808812 · 3808812
1 parent 94d4224
commit 3808812
Show file tree

Hide file tree

Showing 13 changed files with 261 additions and 80 deletions.
diff --git a/emarsys-sdk/src/androidTest/java/com/emarsys/InappNotificationIntegrationTest.kt b/emarsys-sdk/src/androidTest/java/com/emarsys/InappNotificationIntegrationTest.kt
@@ -129,7 +129,9 @@ class InappNotificationIntegrationTest : AnnotationSpec() {
             operation = NotificationOperation.INIT.name,
             actions = null,
             defaultAction = null,
-            inapp = inappPayload
+            inapp = inappPayload,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
         val intent = IntentUtils.createNotificationHandlerServiceIntent(
             application,

diff --git a/.../androidTest/java/com/emarsys/mobileengage/notification/NotificationCommandFactoryTest.kt b/.../androidTest/java/com/emarsys/mobileengage/notification/NotificationCommandFactoryTest.kt
@@ -54,6 +54,8 @@ class NotificationCommandFactoryTest : AnnotationSpec() {
         const val MULTICHANNEL_ID = "test multiChannel id"
         const val SMALL_RESOURCE_ID = 123
         const val COLOR_RESOURCE_ID = 456
+        const val MESSAGE_ID = "messageId"
+        const val U = "{\"customField\":\"customValue\"}"
         val notificationMethod = NotificationMethod(COLLAPSE_ID, NotificationOperation.INIT)
         val notificationData = NotificationData(
             null,
@@ -74,12 +76,12 @@ class NotificationCommandFactoryTest : AnnotationSpec() {
             rootParams = mapOf(
                 "rootParamKey1" to "rootParamValue1",
                 "rootParamKey2" to "rootParamValue2"
-            )
+            ),
+            u = U,
+            message_id = MESSAGE_ID
         )
     }
 
-
-
     private lateinit var factory: NotificationCommandFactory
     private lateinit var context: Context
     private lateinit var mockConcurrentHandlerHolder: ConcurrentHandlerHolder
@@ -425,6 +427,7 @@ class NotificationCommandFactoryTest : AnnotationSpec() {
             mapOf(
                 "rootParamKey1" to "rootParamValue1",
                 "rootParamKey2" to "rootParamValue2",
+                "u" to U,
                 "title" to TITLE,
                 "body" to BODY,
                 "channelId" to CHANNEL_ID,
@@ -446,7 +449,9 @@ class NotificationCommandFactoryTest : AnnotationSpec() {
                             )
                         )
                     )
-                )
+                ),
+                "u" to U,
+                "message_id" to MESSAGE_ID
             )
         )
         JsonUtils.toFlatMap(payload!!) shouldBe JsonUtils.toFlatMap(expected)

diff --git a/...Test/java/com/emarsys/mobileengage/notification/command/DismissNotificationCommandTest.kt b/...Test/java/com/emarsys/mobileengage/notification/command/DismissNotificationCommandTest.kt
@@ -38,7 +38,9 @@ class DismissNotificationCommandTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
     }
 

diff --git a/...st/java/com/emarsys/mobileengage/notification/command/PreloadedInappHandlerCommandTest.kt b/...st/java/com/emarsys/mobileengage/notification/command/PreloadedInappHandlerCommandTest.kt
@@ -50,7 +50,9 @@ class PreloadedInappHandlerCommandTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = NotificationOperation.INIT.name,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
     }
 

diff --git a/mobile-engage/src/androidTest/java/com/emarsys/mobileengage/service/IntentUtilsTest.kt b/mobile-engage/src/androidTest/java/com/emarsys/mobileengage/service/IntentUtilsTest.kt
@@ -40,7 +40,9 @@ class IntentUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = NotificationOperation.INIT.name,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
     }
 

diff --git a/...engage/src/androidTest/java/com/emarsys/mobileengage/service/MessagingServiceUtilsTest.kt b/...engage/src/androidTest/java/com/emarsys/mobileengage/service/MessagingServiceUtilsTest.kt
@@ -77,7 +77,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
     }
 
@@ -221,6 +223,8 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             operation = OPERATION,
             actions = null,
             inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val ems = JSONObject()
@@ -289,7 +293,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         MessagingServiceUtils.createNotification(
@@ -317,6 +323,8 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             operation = OPERATION,
             actions = null,
             inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val input: MutableMap<String, String> = HashMap()
@@ -353,7 +361,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val input: MutableMap<String, String> = HashMap()
@@ -389,7 +399,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val result = MessagingServiceUtils.createNotification(
@@ -420,7 +432,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val result = MessagingServiceUtils.createNotification(
@@ -454,7 +468,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val result = MessagingServiceUtils.createNotification(
@@ -488,7 +504,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val expectedColor = ContextCompat.getColor(context, colorResourceId)
@@ -520,7 +538,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val result = MessagingServiceUtils.createNotification(
@@ -550,7 +570,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val result = MessagingServiceUtils.createNotification(
@@ -580,7 +602,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val notificationSettings: NotificationSettings = mock()
@@ -617,7 +641,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val notificationSettings: NotificationSettings = mock()
@@ -672,7 +698,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = actions.toString(),
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val result = MessagingServiceUtils.createNotification(
@@ -715,7 +743,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val notificationSettings: NotificationSettings = mock()
@@ -750,7 +780,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         val notificationSettings: NotificationSettings = mock()
@@ -872,7 +904,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         MessagingServiceUtils.createSilentPushCommands(
@@ -897,7 +931,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         MessagingServiceUtils.createSilentPushCommands(
@@ -958,7 +994,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = actions,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         MessagingServiceUtils.createSilentPushCommands(
@@ -1017,7 +1055,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = actions,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
 
         MessagingServiceUtils.createSilentPushCommands(
@@ -1062,7 +1102,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
                 collapseId = COLLAPSE_ID,
                 operation = OPERATION,
                 actions = null,
-                inapp = null
+                inapp = null,
+                u = "{\"customField\":\"customValue\"}",
+                message_id = "messageId"
             ),
             mockFileDownloader,
             deviceInfo
@@ -1095,7 +1137,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
                 collapseId = COLLAPSE_ID,
                 operation = OPERATION,
                 actions = null,
-                inapp = null
+                inapp = null,
+                u = "{\"customField\":\"customValue\"}",
+                message_id = "messageId"
             ),
             mockFileDownloader,
             deviceInfo
@@ -1132,7 +1176,9 @@ class MessagingServiceUtilsTest : AnnotationSpec() {
                 collapseId = COLLAPSE_ID,
                 operation = OPERATION,
                 actions = null,
-                inapp = null
+                inapp = null,
+                u = "{\"customField\":\"customValue\"}",
+                message_id = "messageId"
             ),
             mockFileDownloader,
             deviceInfo

diff --git a/...gage/src/androidTest/java/com/emarsys/mobileengage/service/NotificationActionUtilsTest.kt b/...gage/src/androidTest/java/com/emarsys/mobileengage/service/NotificationActionUtilsTest.kt
@@ -36,7 +36,9 @@ class NotificationActionUtilsTest : AnnotationSpec() {
             collapseId = COLLAPSE_ID,
             operation = OPERATION,
             actions = null,
-            inapp = null
+            inapp = null,
+            u = "{\"customField\":\"customValue\"}",
+            message_id = "messageId"
         )
     }