gs2 1.4.81 → 1.4.83
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/distributor/model/TransactionResult.d.ts +4 -0
- package/distributor/model/TransactionResult.js +14 -0
- package/distributor/model/TransactionResult.js.map +1 -1
- package/distributor/model/TransactionResult.ts +14 -0
- package/package.json +1 -1
- package/ranking2/model/ClusterRankingData.d.ts +2 -2
- package/ranking2/model/ClusterRankingData.js +12 -12
- package/ranking2/model/ClusterRankingData.js.map +1 -1
- package/ranking2/model/ClusterRankingData.ts +12 -12
- package/ranking2/model/GlobalRankingData.d.ts +2 -2
- package/ranking2/model/GlobalRankingData.js +11 -11
- package/ranking2/model/GlobalRankingData.js.map +1 -1
- package/ranking2/model/GlobalRankingData.ts +11 -11
|
@@ -7,6 +7,7 @@ export default class TransactionResult implements IModel {
|
|
|
7
7
|
private verifyResults;
|
|
8
8
|
private consumeResults;
|
|
9
9
|
private acquireResults;
|
|
10
|
+
private hasError;
|
|
10
11
|
private createdAt;
|
|
11
12
|
private revision;
|
|
12
13
|
static getRegion(grn: string): string | null;
|
|
@@ -34,6 +35,9 @@ export default class TransactionResult implements IModel {
|
|
|
34
35
|
getAcquireResults(): Gs2Distributor.AcquireActionResult[] | null;
|
|
35
36
|
setAcquireResults(acquireResults: Gs2Distributor.AcquireActionResult[] | null): this;
|
|
36
37
|
withAcquireResults(acquireResults: Gs2Distributor.AcquireActionResult[] | null): this;
|
|
38
|
+
getHasError(): boolean | null;
|
|
39
|
+
setHasError(hasError: boolean | null): this;
|
|
40
|
+
withHasError(hasError: boolean | null): this;
|
|
37
41
|
getCreatedAt(): number | null;
|
|
38
42
|
setCreatedAt(createdAt: number | null): this;
|
|
39
43
|
withCreatedAt(createdAt: number | null): this;
|
|
@@ -26,6 +26,7 @@ var TransactionResult = /** @class */ (function () {
|
|
|
26
26
|
this.verifyResults = null;
|
|
27
27
|
this.consumeResults = null;
|
|
28
28
|
this.acquireResults = null;
|
|
29
|
+
this.hasError = null;
|
|
29
30
|
this.createdAt = null;
|
|
30
31
|
this.revision = null;
|
|
31
32
|
}
|
|
@@ -181,6 +182,17 @@ var TransactionResult = /** @class */ (function () {
|
|
|
181
182
|
this.acquireResults = acquireResults;
|
|
182
183
|
return this;
|
|
183
184
|
};
|
|
185
|
+
TransactionResult.prototype.getHasError = function () {
|
|
186
|
+
return this.hasError;
|
|
187
|
+
};
|
|
188
|
+
TransactionResult.prototype.setHasError = function (hasError) {
|
|
189
|
+
this.hasError = hasError;
|
|
190
|
+
return this;
|
|
191
|
+
};
|
|
192
|
+
TransactionResult.prototype.withHasError = function (hasError) {
|
|
193
|
+
this.hasError = hasError;
|
|
194
|
+
return this;
|
|
195
|
+
};
|
|
184
196
|
TransactionResult.prototype.getCreatedAt = function () {
|
|
185
197
|
return this.createdAt;
|
|
186
198
|
};
|
|
@@ -223,6 +235,7 @@ var TransactionResult = /** @class */ (function () {
|
|
|
223
235
|
data.acquireResults.map(function (item) {
|
|
224
236
|
return Gs2Distributor.AcquireActionResult.fromDict(item);
|
|
225
237
|
}) : null)
|
|
238
|
+
.withHasError(data["hasError"])
|
|
226
239
|
.withCreatedAt(data["createdAt"])
|
|
227
240
|
.withRevision(data["revision"]);
|
|
228
241
|
};
|
|
@@ -243,6 +256,7 @@ var TransactionResult = /** @class */ (function () {
|
|
|
243
256
|
this.getAcquireResults().map(function (item) {
|
|
244
257
|
return item.toDict();
|
|
245
258
|
}) : null,
|
|
259
|
+
"hasError": this.getHasError(),
|
|
246
260
|
"createdAt": this.getCreatedAt(),
|
|
247
261
|
"revision": this.getRevision(),
|
|
248
262
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionResult.js","sourceRoot":"","sources":["TransactionResult.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAIH,8EAAyD;AAIzD,IAAM,SAAS,GAAW,yGAAyG,CAAC;AAEpI;IAAA;QACY,wBAAmB,GAAgB,IAAI,CAAC;QACxC,WAAM,GAAgB,IAAI,CAAC;QAC3B,kBAAa,GAAgB,IAAI,CAAC;QAClC,kBAAa,GAA6C,IAAI,CAAC;QAC/D,mBAAc,GAA8C,IAAI,CAAC;QACjE,mBAAc,GAA8C,IAAI,CAAC;QACjE,cAAS,GAAgB,IAAI,CAAC;QAC9B,aAAQ,GAAgB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"TransactionResult.js","sourceRoot":"","sources":["TransactionResult.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,7 @@ export default class TransactionResult implements IModel {
|
|
|
29
29
|
private verifyResults: Gs2Distributor.VerifyActionResult[]|null = null;
|
|
30
30
|
private consumeResults: Gs2Distributor.ConsumeActionResult[]|null = null;
|
|
31
31
|
private acquireResults: Gs2Distributor.AcquireActionResult[]|null = null;
|
|
32
|
+
private hasError: boolean|null = null;
|
|
32
33
|
private createdAt: number|null = null;
|
|
33
34
|
private revision: number|null = null;
|
|
34
35
|
|
|
@@ -201,6 +202,17 @@ export default class TransactionResult implements IModel {
|
|
|
201
202
|
this.acquireResults = acquireResults;
|
|
202
203
|
return this;
|
|
203
204
|
}
|
|
205
|
+
public getHasError(): boolean|null {
|
|
206
|
+
return this.hasError;
|
|
207
|
+
}
|
|
208
|
+
public setHasError(hasError: boolean|null) {
|
|
209
|
+
this.hasError = hasError;
|
|
210
|
+
return this;
|
|
211
|
+
}
|
|
212
|
+
public withHasError(hasError: boolean|null): this {
|
|
213
|
+
this.hasError = hasError;
|
|
214
|
+
return this;
|
|
215
|
+
}
|
|
204
216
|
public getCreatedAt(): number|null {
|
|
205
217
|
return this.createdAt;
|
|
206
218
|
}
|
|
@@ -247,6 +259,7 @@ export default class TransactionResult implements IModel {
|
|
|
247
259
|
return Gs2Distributor.AcquireActionResult.fromDict(item);
|
|
248
260
|
}
|
|
249
261
|
) : null)
|
|
262
|
+
.withHasError(data["hasError"])
|
|
250
263
|
.withCreatedAt(data["createdAt"])
|
|
251
264
|
.withRevision(data["revision"]);
|
|
252
265
|
}
|
|
@@ -271,6 +284,7 @@ export default class TransactionResult implements IModel {
|
|
|
271
284
|
return item.toDict();
|
|
272
285
|
}
|
|
273
286
|
) : null,
|
|
287
|
+
"hasError": this.getHasError(),
|
|
274
288
|
"createdAt": this.getCreatedAt(),
|
|
275
289
|
"revision": this.getRevision(),
|
|
276
290
|
};
|
package/package.json
CHANGED
|
@@ -19,9 +19,9 @@ export default class ClusterRankingData implements IModel {
|
|
|
19
19
|
static getRankingName(grn: string): string | null;
|
|
20
20
|
static getClusterName(grn: string): string | null;
|
|
21
21
|
static getSeason(grn: string): string | null;
|
|
22
|
-
static
|
|
22
|
+
static getScorerUserId(grn: string): string | null;
|
|
23
23
|
static isValid(grn: string): boolean;
|
|
24
|
-
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, rankingName: string | null, clusterName: string | null, season: string | null,
|
|
24
|
+
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, rankingName: string | null, clusterName: string | null, season: string | null, scorerUserId: string | null): string | null;
|
|
25
25
|
getClusterRankingDataId(): string | null;
|
|
26
26
|
setClusterRankingDataId(clusterRankingDataId: string | null): this;
|
|
27
27
|
withClusterRankingDataId(clusterRankingDataId: string | null): this;
|
|
@@ -15,7 +15,7 @@ express or implied. See the License for the specific language governing
|
|
|
15
15
|
permissions and limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
var grnFormat = "grn:gs2:{region}:{ownerId}:ranking2:{namespaceName}:cluster:{rankingName}:ranking:cluster:{clusterName}:{season}:user:{
|
|
18
|
+
var grnFormat = "grn:gs2:{region}:{ownerId}:ranking2:{namespaceName}:cluster:{rankingName}:ranking:cluster:{clusterName}:{season}:user:{scorerUserId}:score";
|
|
19
19
|
var ClusterRankingData = /** @class */ (function () {
|
|
20
20
|
function ClusterRankingData() {
|
|
21
21
|
this.clusterRankingDataId = null;
|
|
@@ -40,7 +40,7 @@ var ClusterRankingData = /** @class */ (function () {
|
|
|
40
40
|
.replace('{rankingName}', '.*')
|
|
41
41
|
.replace('{clusterName}', '.*')
|
|
42
42
|
.replace('{season}', '.*')
|
|
43
|
-
.replace('{
|
|
43
|
+
.replace('{scorerUserId}', '.*'));
|
|
44
44
|
if (match) {
|
|
45
45
|
return match[1];
|
|
46
46
|
}
|
|
@@ -54,7 +54,7 @@ var ClusterRankingData = /** @class */ (function () {
|
|
|
54
54
|
.replace('{rankingName}', '.*')
|
|
55
55
|
.replace('{clusterName}', '.*')
|
|
56
56
|
.replace('{season}', '.*')
|
|
57
|
-
.replace('{
|
|
57
|
+
.replace('{scorerUserId}', '.*'));
|
|
58
58
|
if (match) {
|
|
59
59
|
return match[1];
|
|
60
60
|
}
|
|
@@ -68,7 +68,7 @@ var ClusterRankingData = /** @class */ (function () {
|
|
|
68
68
|
.replace('{rankingName}', '.*')
|
|
69
69
|
.replace('{clusterName}', '.*')
|
|
70
70
|
.replace('{season}', '.*')
|
|
71
|
-
.replace('{
|
|
71
|
+
.replace('{scorerUserId}', '.*'));
|
|
72
72
|
if (match) {
|
|
73
73
|
return match[1];
|
|
74
74
|
}
|
|
@@ -82,7 +82,7 @@ var ClusterRankingData = /** @class */ (function () {
|
|
|
82
82
|
.replace('{rankingName}', '(.*)')
|
|
83
83
|
.replace('{clusterName}', '.*')
|
|
84
84
|
.replace('{season}', '.*')
|
|
85
|
-
.replace('{
|
|
85
|
+
.replace('{scorerUserId}', '.*'));
|
|
86
86
|
if (match) {
|
|
87
87
|
return match[1];
|
|
88
88
|
}
|
|
@@ -96,7 +96,7 @@ var ClusterRankingData = /** @class */ (function () {
|
|
|
96
96
|
.replace('{rankingName}', '.*')
|
|
97
97
|
.replace('{clusterName}', '(.*)')
|
|
98
98
|
.replace('{season}', '.*')
|
|
99
|
-
.replace('{
|
|
99
|
+
.replace('{scorerUserId}', '.*'));
|
|
100
100
|
if (match) {
|
|
101
101
|
return match[1];
|
|
102
102
|
}
|
|
@@ -110,13 +110,13 @@ var ClusterRankingData = /** @class */ (function () {
|
|
|
110
110
|
.replace('{rankingName}', '.*')
|
|
111
111
|
.replace('{clusterName}', '.*')
|
|
112
112
|
.replace('{season}', '(.*)')
|
|
113
|
-
.replace('{
|
|
113
|
+
.replace('{scorerUserId}', '.*'));
|
|
114
114
|
if (match) {
|
|
115
115
|
return match[1];
|
|
116
116
|
}
|
|
117
117
|
return null;
|
|
118
118
|
};
|
|
119
|
-
ClusterRankingData.
|
|
119
|
+
ClusterRankingData.getScorerUserId = function (grn) {
|
|
120
120
|
var match = grn.match(grnFormat
|
|
121
121
|
.replace('{region}', '.*')
|
|
122
122
|
.replace('{ownerId}', '.*')
|
|
@@ -124,7 +124,7 @@ var ClusterRankingData = /** @class */ (function () {
|
|
|
124
124
|
.replace('{rankingName}', '.*')
|
|
125
125
|
.replace('{clusterName}', '.*')
|
|
126
126
|
.replace('{season}', '.*')
|
|
127
|
-
.replace('{
|
|
127
|
+
.replace('{scorerUserId}', '(.*)'));
|
|
128
128
|
if (match) {
|
|
129
129
|
return match[1];
|
|
130
130
|
}
|
|
@@ -149,12 +149,12 @@ var ClusterRankingData = /** @class */ (function () {
|
|
|
149
149
|
if (this.getSeason(grn) == null || this.getSeason(grn) === '') {
|
|
150
150
|
return false;
|
|
151
151
|
}
|
|
152
|
-
if (this.
|
|
152
|
+
if (this.getScorerUserId(grn) == null || this.getScorerUserId(grn) === '') {
|
|
153
153
|
return false;
|
|
154
154
|
}
|
|
155
155
|
return true;
|
|
156
156
|
};
|
|
157
|
-
ClusterRankingData.createGrn = function (region, ownerId, namespaceName, rankingName, clusterName, season,
|
|
157
|
+
ClusterRankingData.createGrn = function (region, ownerId, namespaceName, rankingName, clusterName, season, scorerUserId) {
|
|
158
158
|
return grnFormat
|
|
159
159
|
.replace('{region}', region !== null && region !== void 0 ? region : '')
|
|
160
160
|
.replace('{ownerId}', ownerId !== null && ownerId !== void 0 ? ownerId : '')
|
|
@@ -162,7 +162,7 @@ var ClusterRankingData = /** @class */ (function () {
|
|
|
162
162
|
.replace('{rankingName}', rankingName !== null && rankingName !== void 0 ? rankingName : '')
|
|
163
163
|
.replace('{clusterName}', clusterName !== null && clusterName !== void 0 ? clusterName : '')
|
|
164
164
|
.replace('{season}', season !== null && season !== void 0 ? season : '')
|
|
165
|
-
.replace('{
|
|
165
|
+
.replace('{scorerUserId}', scorerUserId !== null && scorerUserId !== void 0 ? scorerUserId : '');
|
|
166
166
|
};
|
|
167
167
|
ClusterRankingData.prototype.getClusterRankingDataId = function () {
|
|
168
168
|
return this.clusterRankingDataId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterRankingData.js","sourceRoot":"","sources":["ClusterRankingData.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAKH,IAAM,SAAS,GAAW,
|
|
1
|
+
{"version":3,"file":"ClusterRankingData.js","sourceRoot":"","sources":["ClusterRankingData.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ permissions and limitations under the License.
|
|
|
17
17
|
import IModel from '../../core/interface/IModel';
|
|
18
18
|
|
|
19
19
|
import * as Gs2Ranking2 from '../../ranking2/model'
|
|
20
|
-
const grnFormat: string = "grn:gs2:{region}:{ownerId}:ranking2:{namespaceName}:cluster:{rankingName}:ranking:cluster:{clusterName}:{season}:user:{
|
|
20
|
+
const grnFormat: string = "grn:gs2:{region}:{ownerId}:ranking2:{namespaceName}:cluster:{rankingName}:ranking:cluster:{clusterName}:{season}:user:{scorerUserId}:score";
|
|
21
21
|
|
|
22
22
|
export default class ClusterRankingData implements IModel {
|
|
23
23
|
private clusterRankingDataId: string|null = null;
|
|
@@ -42,7 +42,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
42
42
|
.replace('{rankingName}', '.*')
|
|
43
43
|
.replace('{clusterName}', '.*')
|
|
44
44
|
.replace('{season}', '.*')
|
|
45
|
-
.replace('{
|
|
45
|
+
.replace('{scorerUserId}', '.*')
|
|
46
46
|
);
|
|
47
47
|
if (match) {
|
|
48
48
|
return match[1];
|
|
@@ -58,7 +58,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
58
58
|
.replace('{rankingName}', '.*')
|
|
59
59
|
.replace('{clusterName}', '.*')
|
|
60
60
|
.replace('{season}', '.*')
|
|
61
|
-
.replace('{
|
|
61
|
+
.replace('{scorerUserId}', '.*')
|
|
62
62
|
);
|
|
63
63
|
if (match) {
|
|
64
64
|
return match[1];
|
|
@@ -74,7 +74,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
74
74
|
.replace('{rankingName}', '.*')
|
|
75
75
|
.replace('{clusterName}', '.*')
|
|
76
76
|
.replace('{season}', '.*')
|
|
77
|
-
.replace('{
|
|
77
|
+
.replace('{scorerUserId}', '.*')
|
|
78
78
|
);
|
|
79
79
|
if (match) {
|
|
80
80
|
return match[1];
|
|
@@ -90,7 +90,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
90
90
|
.replace('{rankingName}', '(.*)')
|
|
91
91
|
.replace('{clusterName}', '.*')
|
|
92
92
|
.replace('{season}', '.*')
|
|
93
|
-
.replace('{
|
|
93
|
+
.replace('{scorerUserId}', '.*')
|
|
94
94
|
);
|
|
95
95
|
if (match) {
|
|
96
96
|
return match[1];
|
|
@@ -106,7 +106,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
106
106
|
.replace('{rankingName}', '.*')
|
|
107
107
|
.replace('{clusterName}', '(.*)')
|
|
108
108
|
.replace('{season}', '.*')
|
|
109
|
-
.replace('{
|
|
109
|
+
.replace('{scorerUserId}', '.*')
|
|
110
110
|
);
|
|
111
111
|
if (match) {
|
|
112
112
|
return match[1];
|
|
@@ -122,7 +122,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
122
122
|
.replace('{rankingName}', '.*')
|
|
123
123
|
.replace('{clusterName}', '.*')
|
|
124
124
|
.replace('{season}', '(.*)')
|
|
125
|
-
.replace('{
|
|
125
|
+
.replace('{scorerUserId}', '.*')
|
|
126
126
|
);
|
|
127
127
|
if (match) {
|
|
128
128
|
return match[1];
|
|
@@ -130,7 +130,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
130
130
|
return null;
|
|
131
131
|
}
|
|
132
132
|
|
|
133
|
-
public static
|
|
133
|
+
public static getScorerUserId(grn: string): string|null {
|
|
134
134
|
const match = grn.match(grnFormat
|
|
135
135
|
.replace('{region}', '.*')
|
|
136
136
|
.replace('{ownerId}', '.*')
|
|
@@ -138,7 +138,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
138
138
|
.replace('{rankingName}', '.*')
|
|
139
139
|
.replace('{clusterName}', '.*')
|
|
140
140
|
.replace('{season}', '.*')
|
|
141
|
-
.replace('{
|
|
141
|
+
.replace('{scorerUserId}', '(.*)')
|
|
142
142
|
);
|
|
143
143
|
if (match) {
|
|
144
144
|
return match[1];
|
|
@@ -165,7 +165,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
165
165
|
if (this.getSeason(grn) == null || this.getSeason(grn) === '') {
|
|
166
166
|
return false;
|
|
167
167
|
}
|
|
168
|
-
if (this.
|
|
168
|
+
if (this.getScorerUserId(grn) == null || this.getScorerUserId(grn) === '') {
|
|
169
169
|
return false;
|
|
170
170
|
}
|
|
171
171
|
return true;
|
|
@@ -178,7 +178,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
178
178
|
rankingName: string|null,
|
|
179
179
|
clusterName: string|null,
|
|
180
180
|
season: string|null,
|
|
181
|
-
|
|
181
|
+
scorerUserId: string|null,
|
|
182
182
|
): string|null {
|
|
183
183
|
return grnFormat
|
|
184
184
|
.replace('{region}', region ?? '')
|
|
@@ -187,7 +187,7 @@ export default class ClusterRankingData implements IModel {
|
|
|
187
187
|
.replace('{rankingName}', rankingName ?? '')
|
|
188
188
|
.replace('{clusterName}', clusterName ?? '')
|
|
189
189
|
.replace('{season}', season ?? '')
|
|
190
|
-
.replace('{
|
|
190
|
+
.replace('{scorerUserId}', scorerUserId ?? '');
|
|
191
191
|
}
|
|
192
192
|
public getClusterRankingDataId(): string|null {
|
|
193
193
|
return this.clusterRankingDataId;
|
|
@@ -17,9 +17,9 @@ export default class GlobalRankingData implements IModel {
|
|
|
17
17
|
static getNamespaceName(grn: string): string | null;
|
|
18
18
|
static getRankingName(grn: string): string | null;
|
|
19
19
|
static getSeason(grn: string): string | null;
|
|
20
|
-
static
|
|
20
|
+
static getScorerUserId(grn: string): string | null;
|
|
21
21
|
static isValid(grn: string): boolean;
|
|
22
|
-
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, rankingName: string | null, season: string | null,
|
|
22
|
+
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, rankingName: string | null, season: string | null, scorerUserId: string | null): string | null;
|
|
23
23
|
getGlobalRankingDataId(): string | null;
|
|
24
24
|
setGlobalRankingDataId(globalRankingDataId: string | null): this;
|
|
25
25
|
withGlobalRankingDataId(globalRankingDataId: string | null): this;
|
|
@@ -15,7 +15,7 @@ express or implied. See the License for the specific language governing
|
|
|
15
15
|
permissions and limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
var grnFormat = "grn:gs2:{region}:{ownerId}:ranking2:{namespaceName}:global:{rankingName}:ranking:global:{season}:user:{
|
|
18
|
+
var grnFormat = "grn:gs2:{region}:{ownerId}:ranking2:{namespaceName}:global:{rankingName}:ranking:global:{season}:user:{scorerUserId}:score";
|
|
19
19
|
var GlobalRankingData = /** @class */ (function () {
|
|
20
20
|
function GlobalRankingData() {
|
|
21
21
|
this.globalRankingDataId = null;
|
|
@@ -38,7 +38,7 @@ var GlobalRankingData = /** @class */ (function () {
|
|
|
38
38
|
.replace('{namespaceName}', '.*')
|
|
39
39
|
.replace('{rankingName}', '.*')
|
|
40
40
|
.replace('{season}', '.*')
|
|
41
|
-
.replace('{
|
|
41
|
+
.replace('{scorerUserId}', '.*'));
|
|
42
42
|
if (match) {
|
|
43
43
|
return match[1];
|
|
44
44
|
}
|
|
@@ -51,7 +51,7 @@ var GlobalRankingData = /** @class */ (function () {
|
|
|
51
51
|
.replace('{namespaceName}', '.*')
|
|
52
52
|
.replace('{rankingName}', '.*')
|
|
53
53
|
.replace('{season}', '.*')
|
|
54
|
-
.replace('{
|
|
54
|
+
.replace('{scorerUserId}', '.*'));
|
|
55
55
|
if (match) {
|
|
56
56
|
return match[1];
|
|
57
57
|
}
|
|
@@ -64,7 +64,7 @@ var GlobalRankingData = /** @class */ (function () {
|
|
|
64
64
|
.replace('{namespaceName}', '(.*)')
|
|
65
65
|
.replace('{rankingName}', '.*')
|
|
66
66
|
.replace('{season}', '.*')
|
|
67
|
-
.replace('{
|
|
67
|
+
.replace('{scorerUserId}', '.*'));
|
|
68
68
|
if (match) {
|
|
69
69
|
return match[1];
|
|
70
70
|
}
|
|
@@ -77,7 +77,7 @@ var GlobalRankingData = /** @class */ (function () {
|
|
|
77
77
|
.replace('{namespaceName}', '.*')
|
|
78
78
|
.replace('{rankingName}', '(.*)')
|
|
79
79
|
.replace('{season}', '.*')
|
|
80
|
-
.replace('{
|
|
80
|
+
.replace('{scorerUserId}', '.*'));
|
|
81
81
|
if (match) {
|
|
82
82
|
return match[1];
|
|
83
83
|
}
|
|
@@ -90,20 +90,20 @@ var GlobalRankingData = /** @class */ (function () {
|
|
|
90
90
|
.replace('{namespaceName}', '.*')
|
|
91
91
|
.replace('{rankingName}', '.*')
|
|
92
92
|
.replace('{season}', '(.*)')
|
|
93
|
-
.replace('{
|
|
93
|
+
.replace('{scorerUserId}', '.*'));
|
|
94
94
|
if (match) {
|
|
95
95
|
return match[1];
|
|
96
96
|
}
|
|
97
97
|
return null;
|
|
98
98
|
};
|
|
99
|
-
GlobalRankingData.
|
|
99
|
+
GlobalRankingData.getScorerUserId = function (grn) {
|
|
100
100
|
var match = grn.match(grnFormat
|
|
101
101
|
.replace('{region}', '.*')
|
|
102
102
|
.replace('{ownerId}', '.*')
|
|
103
103
|
.replace('{namespaceName}', '.*')
|
|
104
104
|
.replace('{rankingName}', '.*')
|
|
105
105
|
.replace('{season}', '.*')
|
|
106
|
-
.replace('{
|
|
106
|
+
.replace('{scorerUserId}', '(.*)'));
|
|
107
107
|
if (match) {
|
|
108
108
|
return match[1];
|
|
109
109
|
}
|
|
@@ -125,19 +125,19 @@ var GlobalRankingData = /** @class */ (function () {
|
|
|
125
125
|
if (this.getSeason(grn) == null || this.getSeason(grn) === '') {
|
|
126
126
|
return false;
|
|
127
127
|
}
|
|
128
|
-
if (this.
|
|
128
|
+
if (this.getScorerUserId(grn) == null || this.getScorerUserId(grn) === '') {
|
|
129
129
|
return false;
|
|
130
130
|
}
|
|
131
131
|
return true;
|
|
132
132
|
};
|
|
133
|
-
GlobalRankingData.createGrn = function (region, ownerId, namespaceName, rankingName, season,
|
|
133
|
+
GlobalRankingData.createGrn = function (region, ownerId, namespaceName, rankingName, season, scorerUserId) {
|
|
134
134
|
return grnFormat
|
|
135
135
|
.replace('{region}', region !== null && region !== void 0 ? region : '')
|
|
136
136
|
.replace('{ownerId}', ownerId !== null && ownerId !== void 0 ? ownerId : '')
|
|
137
137
|
.replace('{namespaceName}', namespaceName !== null && namespaceName !== void 0 ? namespaceName : '')
|
|
138
138
|
.replace('{rankingName}', rankingName !== null && rankingName !== void 0 ? rankingName : '')
|
|
139
139
|
.replace('{season}', season !== null && season !== void 0 ? season : '')
|
|
140
|
-
.replace('{
|
|
140
|
+
.replace('{scorerUserId}', scorerUserId !== null && scorerUserId !== void 0 ? scorerUserId : '');
|
|
141
141
|
};
|
|
142
142
|
GlobalRankingData.prototype.getGlobalRankingDataId = function () {
|
|
143
143
|
return this.globalRankingDataId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GlobalRankingData.js","sourceRoot":"","sources":["GlobalRankingData.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAKH,IAAM,SAAS,GAAW,
|
|
1
|
+
{"version":3,"file":"GlobalRankingData.js","sourceRoot":"","sources":["GlobalRankingData.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ permissions and limitations under the License.
|
|
|
17
17
|
import IModel from '../../core/interface/IModel';
|
|
18
18
|
|
|
19
19
|
import * as Gs2Ranking2 from '../../ranking2/model'
|
|
20
|
-
const grnFormat: string = "grn:gs2:{region}:{ownerId}:ranking2:{namespaceName}:global:{rankingName}:ranking:global:{season}:user:{
|
|
20
|
+
const grnFormat: string = "grn:gs2:{region}:{ownerId}:ranking2:{namespaceName}:global:{rankingName}:ranking:global:{season}:user:{scorerUserId}:score";
|
|
21
21
|
|
|
22
22
|
export default class GlobalRankingData implements IModel {
|
|
23
23
|
private globalRankingDataId: string|null = null;
|
|
@@ -40,7 +40,7 @@ export default class GlobalRankingData implements IModel {
|
|
|
40
40
|
.replace('{namespaceName}', '.*')
|
|
41
41
|
.replace('{rankingName}', '.*')
|
|
42
42
|
.replace('{season}', '.*')
|
|
43
|
-
.replace('{
|
|
43
|
+
.replace('{scorerUserId}', '.*')
|
|
44
44
|
);
|
|
45
45
|
if (match) {
|
|
46
46
|
return match[1];
|
|
@@ -55,7 +55,7 @@ export default class GlobalRankingData implements IModel {
|
|
|
55
55
|
.replace('{namespaceName}', '.*')
|
|
56
56
|
.replace('{rankingName}', '.*')
|
|
57
57
|
.replace('{season}', '.*')
|
|
58
|
-
.replace('{
|
|
58
|
+
.replace('{scorerUserId}', '.*')
|
|
59
59
|
);
|
|
60
60
|
if (match) {
|
|
61
61
|
return match[1];
|
|
@@ -70,7 +70,7 @@ export default class GlobalRankingData implements IModel {
|
|
|
70
70
|
.replace('{namespaceName}', '(.*)')
|
|
71
71
|
.replace('{rankingName}', '.*')
|
|
72
72
|
.replace('{season}', '.*')
|
|
73
|
-
.replace('{
|
|
73
|
+
.replace('{scorerUserId}', '.*')
|
|
74
74
|
);
|
|
75
75
|
if (match) {
|
|
76
76
|
return match[1];
|
|
@@ -85,7 +85,7 @@ export default class GlobalRankingData implements IModel {
|
|
|
85
85
|
.replace('{namespaceName}', '.*')
|
|
86
86
|
.replace('{rankingName}', '(.*)')
|
|
87
87
|
.replace('{season}', '.*')
|
|
88
|
-
.replace('{
|
|
88
|
+
.replace('{scorerUserId}', '.*')
|
|
89
89
|
);
|
|
90
90
|
if (match) {
|
|
91
91
|
return match[1];
|
|
@@ -100,7 +100,7 @@ export default class GlobalRankingData implements IModel {
|
|
|
100
100
|
.replace('{namespaceName}', '.*')
|
|
101
101
|
.replace('{rankingName}', '.*')
|
|
102
102
|
.replace('{season}', '(.*)')
|
|
103
|
-
.replace('{
|
|
103
|
+
.replace('{scorerUserId}', '.*')
|
|
104
104
|
);
|
|
105
105
|
if (match) {
|
|
106
106
|
return match[1];
|
|
@@ -108,14 +108,14 @@ export default class GlobalRankingData implements IModel {
|
|
|
108
108
|
return null;
|
|
109
109
|
}
|
|
110
110
|
|
|
111
|
-
public static
|
|
111
|
+
public static getScorerUserId(grn: string): string|null {
|
|
112
112
|
const match = grn.match(grnFormat
|
|
113
113
|
.replace('{region}', '.*')
|
|
114
114
|
.replace('{ownerId}', '.*')
|
|
115
115
|
.replace('{namespaceName}', '.*')
|
|
116
116
|
.replace('{rankingName}', '.*')
|
|
117
117
|
.replace('{season}', '.*')
|
|
118
|
-
.replace('{
|
|
118
|
+
.replace('{scorerUserId}', '(.*)')
|
|
119
119
|
);
|
|
120
120
|
if (match) {
|
|
121
121
|
return match[1];
|
|
@@ -139,7 +139,7 @@ export default class GlobalRankingData implements IModel {
|
|
|
139
139
|
if (this.getSeason(grn) == null || this.getSeason(grn) === '') {
|
|
140
140
|
return false;
|
|
141
141
|
}
|
|
142
|
-
if (this.
|
|
142
|
+
if (this.getScorerUserId(grn) == null || this.getScorerUserId(grn) === '') {
|
|
143
143
|
return false;
|
|
144
144
|
}
|
|
145
145
|
return true;
|
|
@@ -151,7 +151,7 @@ export default class GlobalRankingData implements IModel {
|
|
|
151
151
|
namespaceName: string|null,
|
|
152
152
|
rankingName: string|null,
|
|
153
153
|
season: string|null,
|
|
154
|
-
|
|
154
|
+
scorerUserId: string|null,
|
|
155
155
|
): string|null {
|
|
156
156
|
return grnFormat
|
|
157
157
|
.replace('{region}', region ?? '')
|
|
@@ -159,7 +159,7 @@ export default class GlobalRankingData implements IModel {
|
|
|
159
159
|
.replace('{namespaceName}', namespaceName ?? '')
|
|
160
160
|
.replace('{rankingName}', rankingName ?? '')
|
|
161
161
|
.replace('{season}', season ?? '')
|
|
162
|
-
.replace('{
|
|
162
|
+
.replace('{scorerUserId}', scorerUserId ?? '');
|
|
163
163
|
}
|
|
164
164
|
public getGlobalRankingDataId(): string|null {
|
|
165
165
|
return this.globalRankingDataId;
|