add more reuse of Database.setTokenAndId

Author: fadi-george

src/core/executors/LoginUserOperationExecutor.ts

@@ -223,8 +223,10 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
 
         const pushSubscriptionId = await Database.getPushId();
         if (pushSubscriptionId === localId) {
-          await Database.setPushId(backendSub.id);
-          await Database.setPushToken(backendSub.token);
+          await Database.setTokenAndId({
+            token: backendSub.token,
+            id: backendSub.id,
+          });
         }
 
         const model =

src/core/executors/SubscriptionOperationExecutor.ts

@@ -124,8 +124,10 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
 
       const pushSubscriptionId = await Database.getPushId();
       if (pushSubscriptionId === createOperation.subscriptionId) {
-        await Database.setPushId(backendSubscriptionId);
-        await Database.setPushToken(subscription?.token);
+        await Database.setTokenAndId({
+          token: subscription?.token,
+          id: backendSubscriptionId,
+        });
       }
 
       return new ExecutionResponse(

src/shared/managers/SubscriptionManager.test.ts

@@ -51,9 +51,9 @@ describe('SubscriptionManager', () => {
       expect(subModels.length).toBe(0);
 
       // mimicing the event helper checkAndTriggerSubscriptionChanged
-      await OneSignal.database.setPushToken(
-        rawSubscription.w3cEndpoint?.toString(),
-      );
+      await OneSignal.database.setTokenAndId({
+        token: rawSubscription.w3cEndpoint?.toString(),
+      });
 
       await subscriptionManager._updatePushSubscriptionModelWithRawSubscription(
         rawSubscription,
@@ -164,9 +164,9 @@ describe('SubscriptionManager', () => {
       const subscriptionManager = new SubscriptionManager(context, subConfig);
       const rawSubscription = getRawSubscription();
 
-      await OneSignal.database.setPushToken(
-        rawSubscription.w3cEndpoint?.toString(),
-      );
+      await OneSignal.database.setTokenAndId({
+        token: rawSubscription.w3cEndpoint?.toString(),
+      });
 
       const pushModel = await setupSubModelStore({
         id: '123',