update FCM builder.toObject() for silent notification to add fields in data key.

Author: Mohit Tejani

lib/core/components/push_payload.js

@@ -511,27 +511,27 @@ class FCMNotificationPayload extends BaseNotificationPayload {
         // Strip title/body from android.notification — they belong in top-level notification (or data for silent).
         const { title: _t, body: _b } = androidNotification, androidSpecificFields = __rest(androidNotification, ["title", "body"]);
         if (this._isSilent) {
-            // For silent notifications, send only title/body under top-level data field.
+            // For silent (data-only) notifications, strip all `notification` fields
+            // (both root and android) and move everything into the root `data` object.
             const data = {};
             if (this._title)
                 data.title = this._title;
             if (this._body)
                 data.body = this._body;
+            // Merge android-specific notification fields (sound, icon, tag, etc.) into data.
+            for (const [key, value] of Object.entries(androidSpecificFields)) {
+                if (value !== undefined && value !== null)
+                    data[key] = String(value);
+            }
             // Merge any existing user-provided custom data.
             if (this.payload.data)
                 Object.assign(data, this.payload.data);
             if (Object.keys(data).length)
                 payload.data = data;
-            // Keep android-specific notification fields (sound, icon, tag) in android.notification.
-            if (Object.keys(androidSpecificFields).length) {
-                const { notification: _ } = android, androidWithoutNotification = __rest(android, ["notification"]);
-                payload.android = Object.assign(Object.assign({}, androidWithoutNotification), { notification: androidSpecificFields });
-            }
-            else {
-                const { notification: _ } = android, androidWithoutNotification = __rest(android, ["notification"]);
-                if (android.data || android.collapse_key || android.priority || android.ttl) {
-                    payload.android = androidWithoutNotification;
-                }
+            // Exclude `notification` entirely from android — only keep non-notification android fields.
+            delete android.notification;
+            if (Object.keys(android).length) {
+                payload.android = android;
             }
         }
         else {

src/core/components/push_payload.ts

@@ -899,29 +899,27 @@ export class FCMNotificationPayload extends BaseNotificationPayload {
     const { title: _t, body: _b, ...androidSpecificFields } = androidNotification;
 
     if (this._isSilent) {
-      // For silent notifications, send only title/body under top-level data field.
+      // For silent (data-only) notifications, strip all `notification` fields
+      // (both root and android) and move everything into the root `data` object.
       const data: Record<string, string> = {};
 
       if (this._title) data.title = this._title;
       if (this._body) data.body = this._body;
 
+      // Merge android-specific notification fields (sound, icon, tag, etc.) into data.
+      for (const [key, value] of Object.entries(androidSpecificFields)) {
+        if (value !== undefined && value !== null) data[key] = String(value);
+      }
+
       // Merge any existing user-provided custom data.
       if (this.payload.data) Object.assign(data, this.payload.data);
 
       if (Object.keys(data).length) payload.data = data;
 
-      // Keep android-specific notification fields (sound, icon, tag) in android.notification.
-      if (Object.keys(androidSpecificFields).length) {
-        const { notification: _, ...androidWithoutNotification } = android;
-        payload.android = {
-          ...androidWithoutNotification,
-          notification: androidSpecificFields as FCMAndroidNotification,
-        };
-      } else {
-        const { notification: _, ...androidWithoutNotification } = android;
-        if (android.data || android.collapse_key || android.priority || android.ttl) {
-          payload.android = androidWithoutNotification;
-        }
+      // Exclude `notification` entirely from android — only keep non-notification android fields.
+      delete android.notification;
+      if (Object.keys(android).length) {
+        payload.android = android;
       }
     } else {
       if (Object.keys(notification).length) payload.notification = notification;

test/unit/notifications_payload.test.ts

@@ -221,9 +221,7 @@ describe('#notifications helper', () => {
           data: {
             title: expectedTitle,
             body: expectedBody,
-          },
-          android: {
-            notification: { sound: expectedSound },
+            sound: expectedSound,
           },
         },
       };
@@ -426,17 +424,26 @@ describe('#notifications helper', () => {
       assert(platformPayloadStorage.android.notification);
     });
 
-    it("should set notification 'title' and 'body' with constructor", () => {
+
+    it("should set title and body in top-level notification and badge as notification_count in android.notification", () => {
       let expectedTitle = PubNub.generateUUID();
       let expectedBody = PubNub.generateUUID();
 
       let builder = new FCMNotificationPayload(platformPayloadStorage, expectedTitle, expectedBody);
+      builder.badge = 10;
+      const payload = builder.toObject();
 
-      assert(builder);
-      assert.equal(platformPayloadStorage.notification.title, expectedTitle);
-      assert.equal(platformPayloadStorage.notification.body, expectedBody);
-      assert.equal(platformPayloadStorage.android.notification.title, expectedTitle);
-      assert.equal(platformPayloadStorage.android.notification.body, expectedBody);
+      assert(payload);
+      // title and body should be in top-level notification
+      assert.equal(payload.notification!.title, expectedTitle);
+      assert.equal(payload.notification!.body, expectedBody);
+      // title and body should not be duplicated in android.notification
+      assert(!payload.android?.notification?.title);
+      assert(!payload.android?.notification?.body);
+      // badge should be set as notification_count in android.notification
+      assert(payload.android);
+      assert(payload.android.notification);
+      assert.equal(payload.android.notification.notification_count, 10);
     });
 
     it("should not set 'subtitle' because it is not supported", () => {
@@ -560,10 +567,8 @@ describe('#notifications helper', () => {
       assert(payload.data);
       assert.equal(payload.data.title, expectedTitle);
       assert.equal(payload.data.body, expectedBody);
-      assert(!payload.data.sound, 'sound should not be in data, it belongs in android.notification');
-      assert(payload.android);
-      assert(payload.android.notification);
-      assert.equal(payload.android.notification.sound, expectedSound);
+      assert.equal(payload.data.sound, expectedSound, 'sound should be merged into data for silent notifications');
+      assert(!payload.android, 'android should not be present when only notification fields were set');
     });
 
     it('should return valid payload object with v1 structure', () => {