Skip to content

Commit c897303

Browse files
fadi-georgefadi-george
committed
more renames
1 parent a34c936 commit c897303

8 files changed

+28
-28
lines changed

‎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": "46.352 kB",
87+
"limit": "46.34 kB",
8888
"gzip": true
8989
},
9090
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ describe('LoginUserOperationExecutor', () => {
431431
const transferSubOp = new TransferSubscriptionOperation(
432432
APP_ID,
433433
ONESIGNAL_ID,
434-
createSubOp.subscriptionId,
434+
createSubOp._subscriptionId,
435435
);
436436

437437
const ops = [loginOp, createSubOp, transferSubOp];
@@ -471,7 +471,7 @@ describe('LoginUserOperationExecutor', () => {
471471
const deleteSubOp = new DeleteSubscriptionOperation(
472472
APP_ID,
473473
ONESIGNAL_ID,
474-
createSubOp.subscriptionId,
474+
createSubOp._subscriptionId,
475475
);
476476

477477
const ops = [loginOp, createSubOp, deleteSubOp];

‎src/core/executors/LoginUserOperationExecutor.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
281281
): SubscriptionMap {
282282
switch (true) {
283283
case operation instanceof CreateSubscriptionOperation: {
284-
const subscriptionId = operation.subscriptionId;
284+
const subscriptionId = operation._subscriptionId;
285285
return {
286286
...currentSubs,
287287
[subscriptionId]: {
@@ -299,7 +299,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
299299
}
300300

301301
case operation instanceof UpdateSubscriptionOperation: {
302-
const subscriptionId = operation.subscriptionId;
302+
const subscriptionId = operation._subscriptionId;
303303

304304
if (currentSubs[subscriptionId]) {
305305
return {
@@ -316,7 +316,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
316316
}
317317

318318
case operation instanceof TransferSubscriptionOperation: {
319-
const subscriptionId = operation.subscriptionId;
319+
const subscriptionId = operation._subscriptionId;
320320

321321
return {
322322
...currentSubs,
@@ -329,7 +329,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
329329

330330
case operation instanceof DeleteSubscriptionOperation: {
331331
const subs = { ...currentSubs };
332-
delete subs[operation.subscriptionId];
332+
delete subs[operation._subscriptionId];
333333
return subs;
334334
}
335335

‎src/core/executors/SubscriptionOperationExecutor.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
119119
const { subscription } = response.result;
120120
const subscriptionModel =
121121
this._subscriptionModelStore._getBySubscriptionId(
122-
createOperation.subscriptionId,
122+
createOperation._subscriptionId,
123123
);
124124

125125
const backendSubscriptionId = subscription?.id;
@@ -149,7 +149,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
149149
: undefined,
150150
backendSubscriptionId
151151
? {
152-
[createOperation.subscriptionId]: backendSubscriptionId,
152+
[createOperation._subscriptionId]: backendSubscriptionId,
153153
}
154154
: undefined,
155155
);
@@ -221,7 +221,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
221221

222222
const response = await updateSubscriptionById(
223223
{ appId: lastOp._appId },
224-
lastOp.subscriptionId,
224+
lastOp._subscriptionId,
225225
subscription,
226226
);
227227

@@ -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
) {
@@ -257,7 +257,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
257257
enabled: lastOp.enabled,
258258
notification_types: lastOp.notification_types,
259259
onesignalId: lastOp._onesignalId,
260-
subscriptionId: lastOp.subscriptionId,
260+
subscriptionId: lastOp._subscriptionId,
261261
token: lastOp.token,
262262
type: lastOp.type,
263263
}),
@@ -272,7 +272,7 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
272272
): Promise<ExecutionResponse> {
273273
const response = await transferSubscriptionById(
274274
{ appId: op._appId },
275-
op.subscriptionId,
275+
op._subscriptionId,
276276
{ onesignal_id: op._onesignalId },
277277
false,
278278
);
@@ -301,12 +301,12 @@ export class SubscriptionOperationExecutor implements IOperationExecutor {
301301
): Promise<ExecutionResponse> {
302302
const response = await deleteSubscriptionById(
303303
{ appId: op._appId },
304-
op.subscriptionId,
304+
op._subscriptionId,
305305
);
306306

307307
if (response.ok) {
308308
this._subscriptionModelStore._remove(
309-
op.subscriptionId,
309+
op._subscriptionId,
310310
ModelChangeTags._Hydrate,
311311
);
312312
return new ExecutionResponse(ExecutionResult._Success);
@@ -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/operations/BaseFullSubscriptionOperation.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export abstract class BaseFullSubscriptionOperation extends BaseSubscriptionOper
3434
this.device_os = getDeviceOS();
3535
this.enabled = subscription.enabled;
3636
this.notification_types = subscription.notification_types;
37-
this.subscriptionId = subscription.subscriptionId;
37+
this._subscriptionId = subscription.subscriptionId;
3838
this.token = subscription.token;
3939
this.type = subscription.type;
4040
this.web_auth = subscription.web_auth;

‎src/core/operations/BaseSubscriptionOperation.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ export abstract class BaseSubscriptionOperation<
1919
subscriptionId?: string,
2020
) {
2121
super(operationName, appId, onesignalId);
22-
if (subscriptionId) this.subscriptionId = subscriptionId;
22+
if (subscriptionId) this._subscriptionId = subscriptionId;
2323
}
2424

2525
/**
2626
* The subscription ID for the operation. This ID *may* be locally generated
2727
* and can be checked via IDManager.isLocalId to ensure correct processing.
2828
*/
29-
get subscriptionId(): string {
29+
get _subscriptionId(): string {
3030
return this._getProperty('subscriptionId');
3131
}
32-
protected set subscriptionId(value: string) {
32+
protected set _subscriptionId(value: string) {
3333
this._setProperty('subscriptionId', value);
3434
}
3535

@@ -38,24 +38,24 @@ export abstract class BaseSubscriptionOperation<
3838
}
3939

4040
override get _modifyComparisonKey(): string {
41-
return `${this._appId}.User.${this._onesignalId}.Subscription.${this.subscriptionId}`;
41+
return `${this._appId}.User.${this._onesignalId}.Subscription.${this._subscriptionId}`;
4242
}
4343

4444
override get _canStartExecute(): boolean {
4545
return (
4646
!IDManager._isLocalId(this._onesignalId) &&
47-
!IDManager._isLocalId(this.subscriptionId)
47+
!IDManager._isLocalId(this._subscriptionId)
4848
);
4949
}
5050

5151
override get _applyToRecordId(): string {
52-
return this.subscriptionId;
52+
return this._subscriptionId;
5353
}
5454

5555
override _translateIds(map: Record<string, string>): void {
5656
super._translateIds(map);
57-
if (map[this.subscriptionId]) {
58-
this.subscriptionId = map[this.subscriptionId];
57+
if (map[this._subscriptionId]) {
58+
this._subscriptionId = map[this._subscriptionId];
5959
}
6060
}
6161
}

‎src/core/operations/DeleteSubscriptionOperation.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class DeleteSubscriptionOperation extends BaseSubscriptionOperation {
1010
constructor(appId: string, onesignalId: string, subscriptionId: string);
1111
constructor(appId?: string, onesignalId?: string, subscriptionId?: string) {
1212
super(OPERATION_NAME._DeleteSubscription, appId, onesignalId);
13-
if (subscriptionId) this.subscriptionId = subscriptionId;
13+
if (subscriptionId) this._subscriptionId = subscriptionId;
1414
}
1515

1616
override get _groupComparisonType(): GroupComparisonValue {

‎src/core/operations/TransferSubscriptionOperation.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ export class TransferSubscriptionOperation extends BaseSubscriptionOperation {
1010
constructor(appId: string, onesignalId: string, subscriptionId: string);
1111
constructor(appId?: string, onesignalId?: string, subscriptionId?: string) {
1212
super(OPERATION_NAME._TransferSubscription, appId, onesignalId);
13-
if (subscriptionId) this.subscriptionId = subscriptionId;
13+
if (subscriptionId) this._subscriptionId = subscriptionId;
1414
}
1515

1616
override get _groupComparisonType(): GroupComparisonValue {
1717
return GroupComparisonType._None;
1818
}
1919

2020
override get _modifyComparisonKey(): string {
21-
return `${this._appId}.Subscription.${this.subscriptionId}.Transfer`;
21+
return `${this._appId}.Subscription.${this._subscriptionId}.Transfer`;
2222
}
2323
}

0 commit comments

Comments
 (0)