Skip to content

Commit 2acd6b9

Browse files
fadi-georgefadi-george
committed
rename operation methods
1 parent 10c95f3 commit 2acd6b9

27 files changed

+184
-187
lines changed

‎__test__/support/helpers/executors.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ export class SomeOperation extends Operation {
55
super('some-operation');
66
}
77

8-
get applyToRecordId() {
8+
get _applyToRecordId() {
99
return '';
1010
}
1111

12-
get createComparisonKey() {
12+
get _createComparisonKey() {
1313
return '';
1414
}
1515

16-
get modifyComparisonKey() {
16+
get _modifyComparisonKey() {
1717
return '';
1818
}
1919

20-
get groupComparisonType() {
20+
get _groupComparisonType() {
2121
return GroupComparisonType.CREATE;
2222
}
2323

24-
get canStartExecute() {
24+
get _canStartExecute() {
2525
return true;
2626
}
2727
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
},
8585
{
8686
"path": "./build/releases/OneSignalSDK.page.es6.js",
87-
"limit": "47.8 kB",
87+
"limit": "47.694 kB",
8888
"gzip": true
8989
},
9090
{

‎src/core/executors/CustomEventOperationExecutor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ export class CustomEventsOperationExecutor implements IOperationExecutor {
5050
}
5151

5252
const response = await sendCustomEvent(
53-
{ appId: operation.appId },
53+
{ appId: operation._appId },
5454
{
5555
name: operation.event.name,
56-
onesignal_id: operation.onesignalId,
56+
onesignal_id: operation._onesignalId,
5757
external_id: operation.externalId,
5858
timestamp: operation.timestamp,
5959
payload: {

‎src/core/executors/IdentityOperationExecutor.ts‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,27 @@ export class IdentityOperationExecutor implements IOperationExecutor {
7777
const isSetAlias = lastOperation instanceof SetAliasOperation;
7878
const request = isSetAlias
7979
? addAlias(
80-
{ appId: lastOperation.appId },
80+
{ appId: lastOperation._appId },
8181
{
8282
label: IdentityConstants.ONESIGNAL_ID,
83-
id: lastOperation.onesignalId,
83+
id: lastOperation._onesignalId,
8484
},
8585
{ [lastOperation.label]: lastOperation.value },
8686
)
8787
: deleteAlias(
88-
{ appId: lastOperation.appId },
88+
{ appId: lastOperation._appId },
8989
{
9090
label: IdentityConstants.ONESIGNAL_ID,
91-
id: lastOperation.onesignalId,
91+
id: lastOperation._onesignalId,
9292
},
9393
lastOperation.label,
9494
);
9595

9696
const { ok, status, retryAfterSeconds } = await request;
9797
if (ok) {
9898
if (
99-
this._identityModelStore.model.onesignalId === lastOperation.onesignalId
99+
this._identityModelStore.model.onesignalId ===
100+
lastOperation._onesignalId
100101
) {
101102
this._identityModelStore.model._setProperty(
102103
lastOperation.label,
@@ -136,7 +137,7 @@ export class IdentityOperationExecutor implements IOperationExecutor {
136137
if (
137138
status === 404 &&
138139
this._newRecordState._isInMissingRetryWindow(
139-
lastOperation.onesignalId,
140+
lastOperation._onesignalId,
140141
)
141142
)
142143
return new ExecutionResponse(
@@ -147,8 +148,8 @@ export class IdentityOperationExecutor implements IOperationExecutor {
147148
if (isSetAlias) {
148149
const rebuildOps =
149150
await this._buildUserService.getRebuildOperationsIfCurrentUser(
150-
lastOperation.appId,
151-
lastOperation.onesignalId,
151+
lastOperation._appId,
152+
lastOperation._onesignalId,
152153
);
153154

154155
if (rebuildOps == null)

‎src/core/executors/LoginUserOperationExecutor.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ describe('LoginUserOperationExecutor', () => {
9898
const ops = [someOp];
9999
const result = executor._execute(ops);
100100
await expect(() => result).rejects.toThrow(
101-
`Unrecognized operation: ${someOp.name}`,
101+
`Unrecognized operation: ${someOp._name}`,
102102
);
103103
});
104104

@@ -125,7 +125,7 @@ describe('LoginUserOperationExecutor', () => {
125125
const ops2 = [loginOp, transferSubOp, someOp];
126126
const res2 = executor._execute(ops2);
127127
await expect(res2).rejects.toThrow(
128-
`Unrecognized operation: ${someOp.name}`,
128+
`Unrecognized operation: ${someOp._name}`,
129129
);
130130
});
131131

‎src/core/executors/LoginUserOperationExecutor.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
7070
if (startingOp instanceof LoginUserOperation)
7171
return this._loginUser(startingOp, operations.slice(1));
7272

73-
throw new Error(`Unrecognized operation: ${startingOp.name}`);
73+
throw new Error(`Unrecognized operation: ${startingOp._name}`);
7474
}
7575

7676
private async _loginUser(
@@ -86,7 +86,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
8686

8787
const result = await this._identityOperationExecutor._execute([
8888
new SetAliasOperation(
89-
loginUserOp.appId,
89+
loginUserOp._appId,
9090
loginUserOp.existingOnesignalId,
9191
IdentityConstants.EXTERNAL_ID,
9292
loginUserOp.externalId,
@@ -96,7 +96,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
9696
switch (result.result) {
9797
case ExecutionResult.SUCCESS: {
9898
const backendOneSignalId = loginUserOp.existingOnesignalId;
99-
const opOneSignalId = loginUserOp.onesignalId;
99+
const opOneSignalId = loginUserOp._onesignalId;
100100

101101
if (this._identityModelStore.model.onesignalId === opOneSignalId) {
102102
this._identityModelStore.model._setProperty(
@@ -118,7 +118,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
118118
undefined,
119119
undefined,
120120
{
121-
[loginUserOp.onesignalId]: backendOneSignalId,
121+
[loginUserOp._onesignalId]: backendOneSignalId,
122122
},
123123
);
124124
}
@@ -165,13 +165,13 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
165165
subscriptions,
166166
);
167167
} else {
168-
throw new Error(`Unrecognized operation: ${operation.name}`);
168+
throw new Error(`Unrecognized operation: ${operation._name}`);
169169
}
170170
}
171171

172172
const subscriptionList = Object.entries(subscriptions);
173173
const response = await createNewUser(
174-
{ appId: createUserOperation.appId },
174+
{ appId: createUserOperation._appId },
175175
{
176176
identity,
177177
subscriptions: subscriptionList.map(([, sub]) => sub),
@@ -181,10 +181,10 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
181181

182182
if (response.ok) {
183183
const backendOneSignalId = response.result.identity.onesignal_id;
184-
const opOneSignalId = createUserOperation.onesignalId;
184+
const opOneSignalId = createUserOperation._onesignalId;
185185

186186
const idTranslations: Record<string, string> = {
187-
[createUserOperation.onesignalId]: backendOneSignalId,
187+
[createUserOperation._onesignalId]: backendOneSignalId,
188188
};
189189

190190
if (this._identityModelStore.model.onesignalId === opOneSignalId) {
@@ -238,7 +238,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
238238
Object.keys(identity).length > 0
239239
? [
240240
new RefreshUserOperation(
241-
createUserOperation.appId,
241+
createUserOperation._appId,
242242
backendOneSignalId,
243243
),
244244
]

‎src/core/executors/RefreshUserOperationExecutor.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
6969

7070
private async _getUser(op: RefreshUserOperation): Promise<ExecutionResponse> {
7171
const response = await getUserByAlias(
72-
{ appId: op.appId },
72+
{ appId: op._appId },
7373
{
7474
label: IdentityConstants.ONESIGNAL_ID,
75-
id: op.onesignalId,
75+
id: op._onesignalId,
7676
},
7777
);
7878

7979
const { ok, result, retryAfterSeconds, status } = response;
8080
if (ok) {
81-
if (op.onesignalId !== this._identityModelStore.model.onesignalId) {
81+
if (op._onesignalId !== this._identityModelStore.model.onesignalId) {
8282
return new ExecutionResponse(ExecutionResult.SUCCESS);
8383
}
8484

@@ -88,7 +88,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
8888
}
8989

9090
const propertiesModel = new PropertiesModel();
91-
propertiesModel.onesignalId = op.onesignalId;
91+
propertiesModel.onesignalId = op._onesignalId;
9292

9393
const { properties = {}, subscriptions = [] } = result;
9494

@@ -110,7 +110,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
110110
model.sdk = sub.sdk;
111111
model.device_os = sub.device_os;
112112
model.device_model = sub.device_model;
113-
model.onesignalId = op.onesignalId;
113+
model.onesignalId = op._onesignalId;
114114

115115
// We only add a non-push subscriptions. For push, the device is the source of truth
116116
// so we don't want to cache these subscriptions from the backend.
@@ -122,7 +122,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
122122
const pushModel =
123123
await OneSignal._coreDirector._getPushSubscriptionModel();
124124
if (pushModel) {
125-
pushModel.onesignalId = op.onesignalId;
125+
pushModel.onesignalId = op._onesignalId;
126126
subscriptionModels.push(pushModel);
127127
}
128128

@@ -154,7 +154,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
154154
case ResponseStatusType.MISSING: {
155155
if (
156156
status === 404 &&
157-
this._newRecordState._isInMissingRetryWindow(op.onesignalId)
157+
this._newRecordState._isInMissingRetryWindow(op._onesignalId)
158158
)
159159
return new ExecutionResponse(
160160
ExecutionResult.FAIL_RETRY,
@@ -163,8 +163,8 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
163163

164164
const rebuildOps =
165165
await this._buildUserService.getRebuildOperationsIfCurrentUser(
166-
op.appId,
167-
op.onesignalId,
166+
op._appId,
167+
op._onesignalId,
168168
);
169169
return rebuildOps
170170
? new ExecutionResponse(

‎src/core/executors/SubscriptionOperationExecutor.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
107107
};
108108

109109
const response = await createSubscriptionByAlias(
110-
{ appId: createOperation.appId },
110+
{ appId: createOperation._appId },
111111
{
112112
label: IdentityConstants.ONESIGNAL_ID,
113-
id: createOperation.onesignalId,
113+
id: createOperation._onesignalId,
114114
},
115115
{ subscription },
116116
);
@@ -131,7 +131,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
131131
);
132132
subscriptionModel?._setProperty(
133133
'onesignalId',
134-
createOperation.onesignalId,
134+
createOperation._onesignalId,
135135
ModelChangeTags.HYDRATE,
136136
);
137137
}
@@ -142,8 +142,8 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
142142
!backendSubscriptionId
143143
? [
144144
new RefreshUserOperation(
145-
createOperation.appId,
146-
createOperation.onesignalId,
145+
createOperation._appId,
146+
createOperation._onesignalId,
147147
),
148148
]
149149
: undefined,
@@ -178,7 +178,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
178178
if (
179179
status === 404 &&
180180
this._newRecordState._isInMissingRetryWindow(
181-
createOperation.onesignalId,
181+
createOperation._onesignalId,
182182
)
183183
) {
184184
return new ExecutionResponse(
@@ -189,8 +189,8 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
189189

190190
const rebuildOps =
191191
await this._buildUserService.getRebuildOperationsIfCurrentUser(
192-
createOperation.appId,
193-
createOperation.onesignalId,
192+
createOperation._appId,
193+
createOperation._onesignalId,
194194
);
195195
if (!rebuildOps)
196196
return new ExecutionResponse(ExecutionResult.FAIL_NORETRY);
@@ -220,7 +220,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
220220
};
221221

222222
const response = await updateSubscriptionById(
223-
{ appId: lastOp.appId },
223+
{ appId: lastOp._appId },
224224
lastOp.subscriptionId,
225225
subscription,
226226
);
@@ -241,7 +241,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
241241
case ResponseStatusType.MISSING:
242242
if (
243243
status === 404 &&
244-
[lastOp.onesignalId, lastOp.subscriptionId].some((id) =>
244+
[lastOp._onesignalId, lastOp.subscriptionId].some((id) =>
245245
this._newRecordState._isInMissingRetryWindow(id),
246246
)
247247
) {
@@ -253,10 +253,10 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
253253

254254
return new ExecutionResponse(ExecutionResult.FAIL_NORETRY, undefined, [
255255
new CreateSubscriptionOperation({
256-
appId: lastOp.appId,
256+
appId: lastOp._appId,
257257
enabled: lastOp.enabled,
258258
notification_types: lastOp.notification_types,
259-
onesignalId: lastOp.onesignalId,
259+
onesignalId: lastOp._onesignalId,
260260
subscriptionId: lastOp.subscriptionId,
261261
token: lastOp.token,
262262
type: lastOp.type,
@@ -271,9 +271,9 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
271271
op: TransferSubscriptionOperation,
272272
): Promise<ExecutionResponse> {
273273
const response = await transferSubscriptionById(
274-
{ appId: op.appId },
274+
{ appId: op._appId },
275275
op.subscriptionId,
276-
{ onesignal_id: op.onesignalId },
276+
{ onesignal_id: op._onesignalId },
277277
false,
278278
);
279279

@@ -300,7 +300,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
300300
op: DeleteSubscriptionOperation,
301301
): Promise<ExecutionResponse> {
302302
const response = await deleteSubscriptionById(
303-
{ appId: op.appId },
303+
{ appId: op._appId },
304304
op.subscriptionId,
305305
);
306306

@@ -318,7 +318,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
318318
switch (type) {
319319
case ResponseStatusType.MISSING:
320320
if (
321-
[op.onesignalId, op.subscriptionId].some((id) =>
321+
[op._onesignalId, op.subscriptionId].some((id) =>
322322
this._newRecordState._isInMissingRetryWindow(id),
323323
)
324324
) {

‎src/core/executors/UpdateUserOperationExecutor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ export class UpdateUserOperationExecutor implements IOperationExecutor {
5151
for (const operation of operations) {
5252
if (operation instanceof SetPropertyOperation) {
5353
if (!appId) {
54-
appId = operation.appId;
55-
onesignalId = operation.onesignalId;
54+
appId = operation._appId;
55+
onesignalId = operation._onesignalId;
5656
}
5757
propertiesObject =
5858
PropertyOperationHelper.createPropertiesFromOperation(

0 commit comments

Comments
 (0)