address more pr comments

Author: fadi-george

package.json

@@ -81,7 +81,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "63.75 kB",
+      "limit": "64 kB",
       "gzip": true
     },
     {

src/core/controllers/CustomEventController.ts

@@ -1,6 +1,6 @@
 import MainHelper from '../../shared/helpers/MainHelper';
 import { IdentityModelStore } from '../modelStores/IdentityModelStore';
-import { TrackEventOperation } from '../operations/TrackEventOperation';
+import { TrackCustomEventOperation } from '../operations/TrackCustomEventOperation';
 import type {
   ICustomEvent,
   ICustomEventController,
@@ -25,7 +25,7 @@ export class CustomEventController implements ICustomEventController {
     const appId = MainHelper.getAppId();
     const identityModel = this._identityModelStore.model;
 
-    const op = new TrackEventOperation({
+    const op = new TrackCustomEventOperation({
       appId,
       onesignalId: identityModel.onesignalId,
       externalId: identityModel.externalId,

src/core/executors/CustomEventOperationExecutor.ts

@@ -12,7 +12,7 @@ import { VERSION } from 'src/shared/utils/EnvVariables';
 import { OPERATION_NAME } from '../constants';
 import { ExecutionResponse } from '../operations/ExecutionResponse';
 import { Operation } from '../operations/Operation';
-import { TrackEventOperation } from '../operations/TrackEventOperation';
+import { TrackCustomEventOperation } from '../operations/TrackCustomEventOperation';
 import { RequestService } from '../requestService/RequestService';
 import type { ICustomEventMetadata } from '../types/customEvents';
 import { ExecutionResult, type IOperationExecutor } from '../types/operation';
@@ -45,7 +45,7 @@ export class CustomEventsOperationExecutor implements IOperationExecutor {
     // TODO: each trackEvent is sent individually right now; may need to batch in the future
     const operation = operations[0];
 
-    if (!(operation instanceof TrackEventOperation)) {
+    if (!(operation instanceof TrackCustomEventOperation)) {
       throw new Error(
         `Unrecognized operation! Expected TrackEventOperation, got: ${operation.constructor.name}`,
       );

src/core/executors/LoginUserOperationExecutor.ts

@@ -25,7 +25,6 @@ import { LoginUserOperation } from '../operations/LoginUserOperation';
 import { type Operation } from '../operations/Operation';
 import { RefreshUserOperation } from '../operations/RefreshUserOperation';
 import { SetAliasOperation } from '../operations/SetAliasOperation';
-import { TrackEventOperation } from '../operations/TrackEventOperation';
 import { TransferSubscriptionOperation } from '../operations/TransferSubscriptionOperation';
 import { UpdateSubscriptionOperation } from '../operations/UpdateSubscriptionOperation';
 import { RequestService } from '../requestService/RequestService';

src/core/modelRepo/OperationModelStore.ts

@@ -8,7 +8,7 @@ import { Operation } from '../operations/Operation';
 import { RefreshUserOperation } from '../operations/RefreshUserOperation';
 import { SetAliasOperation } from '../operations/SetAliasOperation';
 import { SetPropertyOperation } from '../operations/SetPropertyOperation';
-import { TrackEventOperation } from '../operations/TrackEventOperation';
+import { TrackCustomEventOperation } from '../operations/TrackCustomEventOperation';
 import { TransferSubscriptionOperation } from '../operations/TransferSubscriptionOperation';
 import { UpdateSubscriptionOperation } from '../operations/UpdateSubscriptionOperation';
 import { ModelName } from '../types/models';
@@ -68,7 +68,7 @@ export class OperationModelStore extends ModelStore<Operation> {
         operation = new SetPropertyOperation();
         break;
       case OPERATION_NAME.CUSTOM_EVENT:
-        operation = new TrackEventOperation();
+        operation = new TrackCustomEventOperation();
         break;
       default:
         throw new Error(`Unrecognized operation: ${operationName}`);

…c/core/operations/TrackEventOperation.ts …/operations/TrackCustomEventOperation.tssrc/core/operations/TrackEventOperation.ts renamed to src/core/operations/TrackCustomEventOperation.ts src/core/operations/TrackEventOperation.ts renamed to src/core/operations/TrackCustomEventOperation.ts

@@ -23,7 +23,7 @@ type ITrackEventOp = Pick<OperationProps, 'externalId' | 'timestamp' | 'event'>;
 /**
  * An Operation to track a custom event for a specific user.
  */
-export class TrackEventOperation extends Operation<ITrackEventOp> {
+export class TrackCustomEventOperation extends Operation<ITrackEventOp> {
   constructor(props?: OperationProps);
   constructor(props: OperationProps) {
     super(OPERATION_NAME.CUSTOM_EVENT, props?.appId, props?.onesignalId);
@@ -62,11 +62,15 @@ export class TrackEventOperation extends Operation<ITrackEventOp> {
     this.setProperty('event', value);
   }
 
+  private get key(): string {
+    return `${this.appId}.User.${this.onesignalId}.CustomEvent.${this.event.name}`;
+  }
+
   override get createComparisonKey(): string {
-    return `${this.appId}.User.${this.onesignalId}.CustomEvent`;
+    return this.key;
   }
   override get modifyComparisonKey(): string {
-    return `${this.appId}.User.${this.onesignalId}.CustomEvent.${this.name}`;
+    return this.key;
   }
 
   // TODO: no batching of custom events until finalized