rename more operation methods

Author: fadi-george

__test__/support/environment/TestEnvironmentHelpers.ts

@@ -95,7 +95,7 @@ export const setupSubModelStore = async ({
     pushModel.web_p256 = web_p256;
   }
   await setPushToken(pushModel.token);
-  OneSignal._coreDirector._subscriptionModelStore.replaceAll(
+  OneSignal._coreDirector._subscriptionModelStore._replaceAll(
     [pushModel],
     ModelChangeTags.NO_PROPAGATE,
   );

__test__/support/helpers/setup.ts

@@ -63,7 +63,7 @@ export const setupIdentityModel = async (
   onesignalID: string = ONESIGNAL_ID,
 ) => {
   const newIdentityModel = new IdentityModel();
-  newIdentityModel.onesignalId = onesignalID;
+  newIdentityModel._onesignalId = onesignalID;
   OneSignal._coreDirector._identityModelStore.replace(
     newIdentityModel,
     ModelChangeTags.NO_PROPAGATE,
@@ -126,7 +126,7 @@ export const setupSubscriptionModel = async (
   const subscriptionModel = new SubscriptionModel();
   subscriptionModel.id = id || '';
   subscriptionModel.token = token || '';
-  OneSignal._coreDirector._subscriptionModelStore.replaceAll(
+  OneSignal._coreDirector._subscriptionModelStore._replaceAll(
     [subscriptionModel],
     ModelChangeTags.NO_PROPAGATE,
   );

package.json

@@ -84,7 +84,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "47.694 kB",
+      "limit": "47.64 kB",
       "gzip": true
     },
     {

src/core/controllers/CustomEventController.ts

@@ -27,8 +27,8 @@ export class CustomEventController implements ICustomEventController {
 
     const op = new TrackCustomEventOperation({
       appId,
-      onesignalId: identityModel.onesignalId,
-      externalId: identityModel.externalId,
+      onesignalId: identityModel._onesignalId,
+      externalId: identityModel._externalId,
       timestamp: new Date().toISOString(),
       event,
     });

src/core/executors/IdentityOperationExecutor.test.ts

@@ -61,7 +61,7 @@ describe('IdentityOperationExecutor', () => {
     );
     getRebuildOpsSpy = vi.spyOn(
       rebuildUserService,
-      'getRebuildOperationsIfCurrentUser',
+      '_getRebuildOperationsIfCurrentUser',
     );
   });
 
@@ -158,7 +158,7 @@ describe('IdentityOperationExecutor', () => {
       expect(res5.retryAfterSeconds).toBeUndefined();
 
       // with rebuild ops
-      identityModelStore.model.onesignalId = ONESIGNAL_ID;
+      identityModelStore.model._onesignalId = ONESIGNAL_ID;
       const res7 = await executor._execute(ops);
       expect(res7.result).toBe(ExecutionResult.FAIL_RETRY);
       expect(res7.retryAfterSeconds).toBeUndefined();

src/core/executors/IdentityOperationExecutor.ts

@@ -96,7 +96,7 @@ export class IdentityOperationExecutor implements IOperationExecutor {
     const { ok, status, retryAfterSeconds } = await request;
     if (ok) {
       if (
-        this._identityModelStore.model.onesignalId ===
+        this._identityModelStore.model._onesignalId ===
         lastOperation._onesignalId
       ) {
         this._identityModelStore.model._setProperty(
@@ -147,7 +147,7 @@ export class IdentityOperationExecutor implements IOperationExecutor {
 
         if (isSetAlias) {
           const rebuildOps =
-            await this._buildUserService.getRebuildOperationsIfCurrentUser(
+            await this._buildUserService._getRebuildOperationsIfCurrentUser(
               lastOperation._appId,
               lastOperation._onesignalId,
             );

src/core/executors/LoginUserOperationExecutor.ts

@@ -98,7 +98,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
         const backendOneSignalId = loginUserOp.existingOnesignalId;
         const opOneSignalId = loginUserOp._onesignalId;
 
-        if (this._identityModelStore.model.onesignalId === opOneSignalId) {
+        if (this._identityModelStore.model._onesignalId === opOneSignalId) {
           this._identityModelStore.model._setProperty(
             IdentityConstants.ONESIGNAL_ID,
             backendOneSignalId,
@@ -187,7 +187,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
         [createUserOperation._onesignalId]: backendOneSignalId,
       };
 
-      if (this._identityModelStore.model.onesignalId === opOneSignalId) {
+      if (this._identityModelStore.model._onesignalId === opOneSignalId) {
         this._identityModelStore.model._setProperty(
           IdentityConstants.ONESIGNAL_ID,
           backendOneSignalId,

src/core/executors/RefreshUserOperationExecutor.test.ts

@@ -58,7 +58,7 @@ describe('RefreshUserOperationExecutor', () => {
     );
     getRebuildOpsSpy = vi.spyOn(
       buildUserService,
-      'getRebuildOperationsIfCurrentUser',
+      '_getRebuildOperationsIfCurrentUser',
     );
   });
 

src/core/executors/RefreshUserOperationExecutor.ts

@@ -78,7 +78,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
 
     const { ok, result, retryAfterSeconds, status } = response;
     if (ok) {
-      if (op._onesignalId !== this._identityModelStore.model.onesignalId) {
+      if (op._onesignalId !== this._identityModelStore.model._onesignalId) {
         return new ExecutionResponse(ExecutionResult.SUCCESS);
       }
 
@@ -131,7 +131,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
         propertiesModel,
         ModelChangeTags.HYDRATE,
       );
-      this._subscriptionsModelStore.replaceAll(
+      this._subscriptionsModelStore._replaceAll(
         subscriptionModels,
         ModelChangeTags.HYDRATE,
       );
@@ -162,7 +162,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
           );
 
         const rebuildOps =
-          await this._buildUserService.getRebuildOperationsIfCurrentUser(
+          await this._buildUserService._getRebuildOperationsIfCurrentUser(
             op._appId,
             op._onesignalId,
           );

src/core/executors/SubscriptionOperationExecutor.test.ts

@@ -70,7 +70,7 @@ describe('SubscriptionOperationExecutor', () => {
     );
     getRebuildOpsSpy = vi.spyOn(
       buildUserService,
-      'getRebuildOperationsIfCurrentUser',
+      '_getRebuildOperationsIfCurrentUser',
     );
   });