gs2-cdk 1.0.42 → 1.0.44
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/adReward/model/Namespace.d.ts +2 -3
- package/adReward/model/Namespace.js +5 -4
- package/adReward/model/Namespace.js.map +1 -1
- package/adReward/model/Namespace.ts +2 -3
- package/adReward/model/options/NamespaceOptions.d.ts +2 -0
- package/adReward/model/options/NamespaceOptions.ts +1 -0
- package/core/model/NotificationSetting.d.ts +2 -2
- package/core/model/NotificationSetting.js +1 -1
- package/core/model/NotificationSetting.js.map +1 -1
- package/core/model/NotificationSetting.ts +2 -2
- package/core/model/TransactionSetting.d.ts +1 -3
- package/core/model/TransactionSetting.js +2 -5
- package/core/model/TransactionSetting.js.map +1 -1
- package/core/model/TransactionSetting.ts +1 -8
- package/jobQueue/model/Namespace.d.ts +0 -1
- package/jobQueue/model/Namespace.js +5 -9
- package/jobQueue/model/Namespace.js.map +1 -1
- package/jobQueue/model/Namespace.ts +1 -5
- package/package.json +1 -1
- package/ranking/model/CategoryModel.d.ts +3 -3
- package/ranking/model/CategoryModel.js +17 -15
- package/ranking/model/CategoryModel.js.map +1 -1
- package/ranking/model/CategoryModel.ts +3 -6
- package/ranking/model/options/CategoryModelOptions.d.ts +1 -0
- package/ranking/model/options/CategoryModelOptions.ts +1 -0
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
import { CdkResource, Stack } from "../../core/model";
|
|
2
2
|
import { GetAttr } from "../../core/func";
|
|
3
|
-
import NotificationSetting from "../../core/model/NotificationSetting";
|
|
4
3
|
import NamespaceRef from "../ref/NamespaceRef";
|
|
5
4
|
import { NamespaceOptions } from "./options/NamespaceOptions";
|
|
6
5
|
export default class Namespace extends CdkResource {
|
|
7
6
|
private readonly stack;
|
|
8
7
|
private readonly name;
|
|
9
|
-
private readonly changePointNotification;
|
|
10
8
|
private readonly admob;
|
|
11
9
|
private readonly unityAd;
|
|
12
10
|
private readonly description;
|
|
11
|
+
private readonly changePointNotification;
|
|
13
12
|
private readonly logSetting;
|
|
14
|
-
constructor(stack: Stack, name: string,
|
|
13
|
+
constructor(stack: Stack, name: string, options?: NamespaceOptions | null);
|
|
15
14
|
alternateKeys(): string;
|
|
16
15
|
resourceType(): string;
|
|
17
16
|
properties(): {
|
|
@@ -20,20 +20,21 @@ const model_1 = require("../../core/model");
|
|
|
20
20
|
const func_1 = require("../../core/func");
|
|
21
21
|
const NamespaceRef_1 = tslib_1.__importDefault(require("../ref/NamespaceRef"));
|
|
22
22
|
class Namespace extends model_1.CdkResource {
|
|
23
|
-
constructor(stack, name,
|
|
24
|
-
var _a, _b, _c, _d;
|
|
23
|
+
constructor(stack, name, options = null) {
|
|
24
|
+
var _a, _b, _c, _d, _e;
|
|
25
25
|
super("AdReward_Namespace_" + name);
|
|
26
26
|
this.admob = null;
|
|
27
27
|
this.unityAd = null;
|
|
28
28
|
this.description = null;
|
|
29
|
+
this.changePointNotification = null;
|
|
29
30
|
this.logSetting = null;
|
|
30
31
|
this.stack = stack;
|
|
31
32
|
this.name = name;
|
|
32
|
-
this.changePointNotification = changePointNotification;
|
|
33
33
|
this.admob = (_a = options === null || options === void 0 ? void 0 : options.admob) !== null && _a !== void 0 ? _a : null;
|
|
34
34
|
this.unityAd = (_b = options === null || options === void 0 ? void 0 : options.unityAd) !== null && _b !== void 0 ? _b : null;
|
|
35
35
|
this.description = (_c = options === null || options === void 0 ? void 0 : options.description) !== null && _c !== void 0 ? _c : null;
|
|
36
|
-
this.
|
|
36
|
+
this.changePointNotification = (_d = options === null || options === void 0 ? void 0 : options.changePointNotification) !== null && _d !== void 0 ? _d : null;
|
|
37
|
+
this.logSetting = (_e = options === null || options === void 0 ? void 0 : options.logSetting) !== null && _e !== void 0 ? _e : null;
|
|
37
38
|
stack.addResource(this);
|
|
38
39
|
}
|
|
39
40
|
alternateKeys() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Namespace.js","sourceRoot":"","sources":["Namespace.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4CAAoD;AACpD,0CAAwC;AAMxC,+EAA+C;AAI/C,MAAqB,SAAU,SAAQ,mBAAW;IAS9C,YACI,KAAY,EACZ,IAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"Namespace.js","sourceRoot":"","sources":["Namespace.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4CAAoD;AACpD,0CAAwC;AAMxC,+EAA+C;AAI/C,MAAqB,SAAU,SAAQ,mBAAW;IAS9C,YACI,KAAY,EACZ,IAAY,EACZ,UAAiC,IAAI;;QAErC,KAAK,CACD,qBAAqB,GAAG,IAAI,CAC/B,CAAC;QAbW,UAAK,GAAe,IAAI,CAAC;QACzB,YAAO,GAAiB,IAAI,CAAC;QAC7B,gBAAW,GAAgB,IAAI,CAAC;QAChC,4BAAuB,GAA6B,IAAI,CAAC;QACzD,eAAU,GAAoB,IAAI,CAAC;QAWhD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,mCAAI,IAAI,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,mCAAI,IAAI,CAAC;QACxC,IAAI,CAAC,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,mCAAI,IAAI,CAAC;QAChD,IAAI,CAAC,uBAAuB,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,uBAAuB,mCAAI,IAAI,CAAC;QACxE,IAAI,CAAC,UAAU,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,mCAAI,IAAI,CAAC;QAC9C,KAAK,CAAC,WAAW,CACb,IAAI,CACP,CAAC;IACN,CAAC;IAGM,aAAa;QAEhB,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,YAAY;QAEf,OAAO,0BAA0B,CAAC;IACtC,CAAC;IAEM,UAAU;;QAEb,IAAI,UAAU,GAA0B,EAAE,CAAC;QAE3C,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;YACnB,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;SAClC;QACD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,UAAU,EAC3C,CAAC;SACL;QACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE;YACtB,UAAU,CAAC,SAAS,CAAC,GAAG,MAAA,IAAI,CAAC,OAAO,0CAAE,UAAU,EAC/C,CAAC;SACL;QACD,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;YAC1B,UAAU,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;SAChD;QACD,IAAI,IAAI,CAAC,uBAAuB,IAAI,IAAI,EAAE;YACtC,UAAU,CAAC,yBAAyB,CAAC,GAAG,MAAA,IAAI,CAAC,uBAAuB,0CAAE,UAAU,EAC/E,CAAC;SACL;QACD,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,EAAE;YACzB,UAAU,CAAC,YAAY,CAAC,GAAG,MAAA,IAAI,CAAC,UAAU,0CAAE,UAAU,EACrD,CAAC;SACL;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAEM,GAAG;QAEN,OAAO,IAAI,sBAAY,CACnB,IAAI,CAAC,IAAK,CACb,CAAC;IACN,CAAC;IAEM,kBAAkB;QAErB,OAAO,IAAI,cAAO,CACd,IAAI,EACJ,kBAAkB,EAClB,IAAI,CACP,CAAC;IACN,CAAC;CACJ;AAtFD,4BAsFC"}
|
|
@@ -28,16 +28,15 @@ import { NamespaceOptions } from "./options/NamespaceOptions";
|
|
|
28
28
|
export default class Namespace extends CdkResource {
|
|
29
29
|
private readonly stack: Stack;
|
|
30
30
|
private readonly name: string;
|
|
31
|
-
private readonly changePointNotification: NotificationSetting;
|
|
32
31
|
private readonly admob: AdMob|null = null;
|
|
33
32
|
private readonly unityAd: UnityAd|null = null;
|
|
34
33
|
private readonly description: string|null = null;
|
|
34
|
+
private readonly changePointNotification: NotificationSetting|null = null;
|
|
35
35
|
private readonly logSetting: LogSetting|null = null;
|
|
36
36
|
|
|
37
37
|
public constructor(
|
|
38
38
|
stack: Stack,
|
|
39
39
|
name: string,
|
|
40
|
-
changePointNotification: NotificationSetting,
|
|
41
40
|
options: NamespaceOptions|null = null,
|
|
42
41
|
) {
|
|
43
42
|
super(
|
|
@@ -46,10 +45,10 @@ export default class Namespace extends CdkResource {
|
|
|
46
45
|
|
|
47
46
|
this.stack = stack;
|
|
48
47
|
this.name = name;
|
|
49
|
-
this.changePointNotification = changePointNotification;
|
|
50
48
|
this.admob = options?.admob ?? null;
|
|
51
49
|
this.unityAd = options?.unityAd ?? null;
|
|
52
50
|
this.description = options?.description ?? null;
|
|
51
|
+
this.changePointNotification = options?.changePointNotification ?? null;
|
|
53
52
|
this.logSetting = options?.logSetting ?? null;
|
|
54
53
|
stack.addResource(
|
|
55
54
|
this,
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import AdMob from "../AdMob";
|
|
2
2
|
import UnityAd from "../UnityAd";
|
|
3
|
+
import NotificationSetting from "../../../core/model/NotificationSetting";
|
|
3
4
|
import LogSetting from "../../../core/model/LogSetting";
|
|
4
5
|
export interface NamespaceOptions {
|
|
5
6
|
admob?: AdMob | null;
|
|
6
7
|
unityAd?: UnityAd | null;
|
|
7
8
|
description?: string | null;
|
|
9
|
+
changePointNotification?: NotificationSetting | null;
|
|
8
10
|
logSetting?: LogSetting | null;
|
|
9
11
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export default class NotificationSetting {
|
|
2
|
-
gatewayNamespaceId: string;
|
|
2
|
+
gatewayNamespaceId: string | null;
|
|
3
3
|
enableTransferMobileNotification: boolean | null;
|
|
4
4
|
sound: string | null;
|
|
5
|
-
constructor(gatewayNamespaceId
|
|
5
|
+
constructor(gatewayNamespaceId?: string | null, enableTransferMobileNotification?: boolean | null, sound?: string | null);
|
|
6
6
|
properties(): {
|
|
7
7
|
[name: string]: any;
|
|
8
8
|
};
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
class NotificationSetting {
|
|
19
|
-
constructor(gatewayNamespaceId, enableTransferMobileNotification = null, sound = null) {
|
|
19
|
+
constructor(gatewayNamespaceId = null, enableTransferMobileNotification = null, sound = null) {
|
|
20
20
|
this.gatewayNamespaceId = gatewayNamespaceId;
|
|
21
21
|
this.enableTransferMobileNotification = enableTransferMobileNotification;
|
|
22
22
|
this.sound = sound;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationSetting.js","sourceRoot":"","sources":["NotificationSetting.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAEH,MAAqB,mBAAmB;IAMpC,YACI,
|
|
1
|
+
{"version":3,"file":"NotificationSetting.js","sourceRoot":"","sources":["NotificationSetting.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAEH,MAAqB,mBAAmB;IAMpC,YACI,qBAAoC,IAAI,EACxC,mCAAmD,IAAI,EACvD,QAAuB,IAAI;QAE3B,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,gCAAgC,GAAG,gCAAgC,CAAC;QACzE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEM,UAAU;QACb,OAAO;YACH,oBAAoB,EAAE,IAAI,CAAC,kBAAkB;YAC7C,kCAAkC,EAAE,IAAI,CAAC,gCAAgC;YACzE,OAAO,EAAE,IAAI,CAAC,KAAK;SACtB,CAAC;IACN,CAAC;CACJ;AAvBD,sCAuBC"}
|
|
@@ -16,12 +16,12 @@
|
|
|
16
16
|
|
|
17
17
|
export default class NotificationSetting {
|
|
18
18
|
|
|
19
|
-
gatewayNamespaceId: string;
|
|
19
|
+
gatewayNamespaceId: string | null;
|
|
20
20
|
enableTransferMobileNotification: boolean | null;
|
|
21
21
|
sound: string | null;
|
|
22
22
|
|
|
23
23
|
public constructor(
|
|
24
|
-
gatewayNamespaceId: string,
|
|
24
|
+
gatewayNamespaceId: string | null = null,
|
|
25
25
|
enableTransferMobileNotification: boolean | null = null,
|
|
26
26
|
sound: string | null = null,
|
|
27
27
|
) {
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
export default class TransactionSetting {
|
|
2
|
-
enableAutoRun: boolean;
|
|
3
2
|
distributorNamespaceId: string | null;
|
|
4
|
-
keyId: string | null;
|
|
5
3
|
queueNamespaceId: string | null;
|
|
6
|
-
constructor(
|
|
4
|
+
constructor(distributorNamespaceId?: string | null, queueNamespaceId?: string | null);
|
|
7
5
|
properties(): {
|
|
8
6
|
[name: string]: any;
|
|
9
7
|
};
|
|
@@ -16,17 +16,14 @@
|
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
class TransactionSetting {
|
|
19
|
-
constructor(
|
|
20
|
-
this.enableAutoRun = enableAutoRun;
|
|
19
|
+
constructor(distributorNamespaceId = null, queueNamespaceId = null) {
|
|
21
20
|
this.distributorNamespaceId = distributorNamespaceId;
|
|
22
|
-
this.keyId = keyId;
|
|
23
21
|
this.queueNamespaceId = queueNamespaceId;
|
|
24
22
|
}
|
|
25
23
|
properties() {
|
|
26
24
|
return {
|
|
27
|
-
"EnableAutoRun":
|
|
25
|
+
"EnableAutoRun": true,
|
|
28
26
|
"DistributorNamespaceId": this.distributorNamespaceId,
|
|
29
|
-
"KeyId": this.keyId,
|
|
30
27
|
"QueueNamespaceId": this.queueNamespaceId,
|
|
31
28
|
};
|
|
32
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionSetting.js","sourceRoot":"","sources":["TransactionSetting.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAEH,MAAqB,kBAAkB;
|
|
1
|
+
{"version":3,"file":"TransactionSetting.js","sourceRoot":"","sources":["TransactionSetting.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAEH,MAAqB,kBAAkB;IAKnC,YACI,yBAAwC,IAAI,EAC5C,mBAAkC,IAAI;QAEtC,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC7C,CAAC;IAEM,UAAU;QACb,OAAO;YACH,eAAe,EAAE,IAAI;YACrB,wBAAwB,EAAE,IAAI,CAAC,sBAAsB;YACrD,kBAAkB,EAAE,IAAI,CAAC,gBAAgB;SAC5C,CAAC;IACN,CAAC;CACJ;AApBD,qCAoBC"}
|
|
@@ -16,28 +16,21 @@
|
|
|
16
16
|
|
|
17
17
|
export default class TransactionSetting {
|
|
18
18
|
|
|
19
|
-
enableAutoRun: boolean;
|
|
20
19
|
distributorNamespaceId: string | null;
|
|
21
|
-
keyId: string | null;
|
|
22
20
|
queueNamespaceId: string | null;
|
|
23
21
|
|
|
24
22
|
public constructor(
|
|
25
|
-
enableAutoRun: boolean,
|
|
26
23
|
distributorNamespaceId: string | null = null,
|
|
27
|
-
keyId: string | null = null,
|
|
28
24
|
queueNamespaceId: string | null = null,
|
|
29
25
|
) {
|
|
30
|
-
this.enableAutoRun = enableAutoRun;
|
|
31
26
|
this.distributorNamespaceId = distributorNamespaceId;
|
|
32
|
-
this.keyId = keyId;
|
|
33
27
|
this.queueNamespaceId = queueNamespaceId;
|
|
34
28
|
}
|
|
35
29
|
|
|
36
30
|
public properties(): { [name: string]: any } {
|
|
37
31
|
return {
|
|
38
|
-
"EnableAutoRun":
|
|
32
|
+
"EnableAutoRun": true,
|
|
39
33
|
"DistributorNamespaceId": this.distributorNamespaceId,
|
|
40
|
-
"KeyId": this.keyId,
|
|
41
34
|
"QueueNamespaceId": this.queueNamespaceId,
|
|
42
35
|
};
|
|
43
36
|
}
|
|
@@ -6,7 +6,6 @@ export default class Namespace extends CdkResource {
|
|
|
6
6
|
private readonly stack;
|
|
7
7
|
private readonly name;
|
|
8
8
|
private readonly description;
|
|
9
|
-
private readonly enableAutoRun;
|
|
10
9
|
private readonly pushNotification;
|
|
11
10
|
private readonly runNotification;
|
|
12
11
|
private readonly logSetting;
|
|
@@ -21,20 +21,18 @@ const func_1 = require("../../core/func");
|
|
|
21
21
|
const NamespaceRef_1 = tslib_1.__importDefault(require("../ref/NamespaceRef"));
|
|
22
22
|
class Namespace extends model_1.CdkResource {
|
|
23
23
|
constructor(stack, name, options = null) {
|
|
24
|
-
var _a, _b, _c, _d
|
|
24
|
+
var _a, _b, _c, _d;
|
|
25
25
|
super("JobQueue_Namespace_" + name);
|
|
26
26
|
this.description = null;
|
|
27
|
-
this.enableAutoRun = null;
|
|
28
27
|
this.pushNotification = null;
|
|
29
28
|
this.runNotification = null;
|
|
30
29
|
this.logSetting = null;
|
|
31
30
|
this.stack = stack;
|
|
32
31
|
this.name = name;
|
|
33
32
|
this.description = (_a = options === null || options === void 0 ? void 0 : options.description) !== null && _a !== void 0 ? _a : null;
|
|
34
|
-
this.
|
|
35
|
-
this.
|
|
36
|
-
this.
|
|
37
|
-
this.logSetting = (_e = options === null || options === void 0 ? void 0 : options.logSetting) !== null && _e !== void 0 ? _e : null;
|
|
33
|
+
this.pushNotification = (_b = options === null || options === void 0 ? void 0 : options.pushNotification) !== null && _b !== void 0 ? _b : null;
|
|
34
|
+
this.runNotification = (_c = options === null || options === void 0 ? void 0 : options.runNotification) !== null && _c !== void 0 ? _c : null;
|
|
35
|
+
this.logSetting = (_d = options === null || options === void 0 ? void 0 : options.logSetting) !== null && _d !== void 0 ? _d : null;
|
|
38
36
|
stack.addResource(this);
|
|
39
37
|
}
|
|
40
38
|
alternateKeys() {
|
|
@@ -52,9 +50,7 @@ class Namespace extends model_1.CdkResource {
|
|
|
52
50
|
if (this.description != null) {
|
|
53
51
|
properties["Description"] = this.description;
|
|
54
52
|
}
|
|
55
|
-
|
|
56
|
-
properties["EnableAutoRun"] = this.enableAutoRun;
|
|
57
|
-
}
|
|
53
|
+
properties["EnableAutoRun"] = true;
|
|
58
54
|
if (this.pushNotification != null) {
|
|
59
55
|
properties["PushNotification"] = (_a = this.pushNotification) === null || _a === void 0 ? void 0 : _a.properties();
|
|
60
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Namespace.js","sourceRoot":"","sources":["Namespace.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4CAAoD;AACpD,0CAAwC;AAIxC,+EAA+C;AAI/C,MAAqB,SAAU,SAAQ,mBAAW;
|
|
1
|
+
{"version":3,"file":"Namespace.js","sourceRoot":"","sources":["Namespace.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4CAAoD;AACpD,0CAAwC;AAIxC,+EAA+C;AAI/C,MAAqB,SAAU,SAAQ,mBAAW;IAQ9C,YACI,KAAY,EACZ,IAAY,EACZ,UAAiC,IAAI;;QAErC,KAAK,CACD,qBAAqB,GAAG,IAAI,CAC/B,CAAC;QAZW,gBAAW,GAAgB,IAAI,CAAC;QAChC,qBAAgB,GAA6B,IAAI,CAAC;QAClD,oBAAe,GAA6B,IAAI,CAAC;QACjD,eAAU,GAAoB,IAAI,CAAC;QAWhD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,mCAAI,IAAI,CAAC;QAChD,IAAI,CAAC,gBAAgB,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,mCAAI,IAAI,CAAC;QAC1D,IAAI,CAAC,eAAe,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,mCAAI,IAAI,CAAC;QACxD,IAAI,CAAC,UAAU,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,mCAAI,IAAI,CAAC;QAC9C,KAAK,CAAC,WAAW,CACb,IAAI,CACP,CAAC;IACN,CAAC;IAGM,aAAa;QAEhB,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,YAAY;QAEf,OAAO,0BAA0B,CAAC;IACtC,CAAC;IAEM,UAAU;;QAEb,IAAI,UAAU,GAA0B,EAAE,CAAC;QAE3C,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;YACnB,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;SAClC;QACD,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;YAC1B,UAAU,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;SAChD;QACD,UAAU,CAAC,eAAe,CAAC,GAAG,IAAI,CAAA;QAClC,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,EAAE;YAC/B,UAAU,CAAC,kBAAkB,CAAC,GAAG,MAAA,IAAI,CAAC,gBAAgB,0CAAE,UAAU,EACjE,CAAC;SACL;QACD,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,EAAE;YAC9B,UAAU,CAAC,iBAAiB,CAAC,GAAG,MAAA,IAAI,CAAC,eAAe,0CAAE,UAAU,EAC/D,CAAC;SACL;QACD,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,EAAE;YACzB,UAAU,CAAC,YAAY,CAAC,GAAG,MAAA,IAAI,CAAC,UAAU,0CAAE,UAAU,EACrD,CAAC;SACL;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAEM,GAAG;QAEN,OAAO,IAAI,sBAAY,CACnB,IAAI,CAAC,IAAK,CACb,CAAC;IACN,CAAC;IAEM,kBAAkB;QAErB,OAAO,IAAI,cAAO,CACd,IAAI,EACJ,kBAAkB,EAClB,IAAI,CACP,CAAC;IACN,CAAC;CACJ;AAjFD,4BAiFC"}
|
|
@@ -27,7 +27,6 @@ export default class Namespace extends CdkResource {
|
|
|
27
27
|
private readonly stack: Stack;
|
|
28
28
|
private readonly name: string;
|
|
29
29
|
private readonly description: string|null = null;
|
|
30
|
-
private readonly enableAutoRun: boolean|null = null;
|
|
31
30
|
private readonly pushNotification: NotificationSetting|null = null;
|
|
32
31
|
private readonly runNotification: NotificationSetting|null = null;
|
|
33
32
|
private readonly logSetting: LogSetting|null = null;
|
|
@@ -44,7 +43,6 @@ export default class Namespace extends CdkResource {
|
|
|
44
43
|
this.stack = stack;
|
|
45
44
|
this.name = name;
|
|
46
45
|
this.description = options?.description ?? null;
|
|
47
|
-
this.enableAutoRun = options?.enableAutoRun ?? null;
|
|
48
46
|
this.pushNotification = options?.pushNotification ?? null;
|
|
49
47
|
this.runNotification = options?.runNotification ?? null;
|
|
50
48
|
this.logSetting = options?.logSetting ?? null;
|
|
@@ -74,9 +72,7 @@ export default class Namespace extends CdkResource {
|
|
|
74
72
|
if (this.description != null) {
|
|
75
73
|
properties["Description"] = this.description;
|
|
76
74
|
}
|
|
77
|
-
|
|
78
|
-
properties["EnableAutoRun"] = this.enableAutoRun;
|
|
79
|
-
}
|
|
75
|
+
properties["EnableAutoRun"] = true
|
|
80
76
|
if (this.pushNotification != null) {
|
|
81
77
|
properties["PushNotification"] = this.pushNotification?.properties(
|
|
82
78
|
);
|
package/package.json
CHANGED
|
@@ -7,10 +7,10 @@ export default class CategoryModel {
|
|
|
7
7
|
private readonly name;
|
|
8
8
|
private readonly orderDirection;
|
|
9
9
|
private readonly scope;
|
|
10
|
-
private readonly uniqueByUserId;
|
|
11
10
|
private readonly metadata;
|
|
12
11
|
private readonly minimumValue;
|
|
13
12
|
private readonly maximumValue;
|
|
13
|
+
private readonly uniqueByUserId;
|
|
14
14
|
private readonly sum;
|
|
15
15
|
private readonly calculateFixedTimingHour;
|
|
16
16
|
private readonly calculateFixedTimingMinute;
|
|
@@ -20,9 +20,9 @@ export default class CategoryModel {
|
|
|
20
20
|
private readonly accessPeriodEventId;
|
|
21
21
|
private readonly ignoreUserIds;
|
|
22
22
|
private readonly generation;
|
|
23
|
-
constructor(name: string, orderDirection: CategoryModelOrderDirection, scope: CategoryModelScope,
|
|
23
|
+
constructor(name: string, orderDirection: CategoryModelOrderDirection, scope: CategoryModelScope, options?: CategoryModelOptions | null);
|
|
24
24
|
static scopeIsGlobal(name: string, orderDirection: CategoryModelOrderDirection, uniqueByUserId: boolean, calculateIntervalMinutes: number, options?: CategoryModelScopeIsGlobalOptions | null): CategoryModel;
|
|
25
|
-
static scopeIsScoped(name: string, orderDirection: CategoryModelOrderDirection,
|
|
25
|
+
static scopeIsScoped(name: string, orderDirection: CategoryModelOrderDirection, options?: CategoryModelScopeIsScopedOptions | null): CategoryModel;
|
|
26
26
|
properties(): {
|
|
27
27
|
[name: string]: any;
|
|
28
28
|
};
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const CategoryModelScope_1 = require("./enum/CategoryModelScope");
|
|
4
4
|
class CategoryModel {
|
|
5
|
-
constructor(name, orderDirection, scope,
|
|
6
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
5
|
+
constructor(name, orderDirection, scope, options = null) {
|
|
6
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
7
7
|
this.metadata = null;
|
|
8
8
|
this.minimumValue = null;
|
|
9
9
|
this.maximumValue = null;
|
|
10
|
+
this.uniqueByUserId = null;
|
|
10
11
|
this.sum = null;
|
|
11
12
|
this.calculateFixedTimingHour = null;
|
|
12
13
|
this.calculateFixedTimingMinute = null;
|
|
@@ -19,22 +20,23 @@ class CategoryModel {
|
|
|
19
20
|
this.name = name;
|
|
20
21
|
this.orderDirection = orderDirection;
|
|
21
22
|
this.scope = scope;
|
|
22
|
-
this.uniqueByUserId = uniqueByUserId;
|
|
23
23
|
this.metadata = (_a = options === null || options === void 0 ? void 0 : options.metadata) !== null && _a !== void 0 ? _a : null;
|
|
24
24
|
this.minimumValue = (_b = options === null || options === void 0 ? void 0 : options.minimumValue) !== null && _b !== void 0 ? _b : null;
|
|
25
25
|
this.maximumValue = (_c = options === null || options === void 0 ? void 0 : options.maximumValue) !== null && _c !== void 0 ? _c : null;
|
|
26
|
-
this.
|
|
27
|
-
this.
|
|
28
|
-
this.
|
|
29
|
-
this.
|
|
30
|
-
this.
|
|
31
|
-
this.
|
|
32
|
-
this.
|
|
33
|
-
this.
|
|
34
|
-
this.
|
|
26
|
+
this.uniqueByUserId = (_d = options === null || options === void 0 ? void 0 : options.uniqueByUserId) !== null && _d !== void 0 ? _d : null;
|
|
27
|
+
this.sum = (_e = options === null || options === void 0 ? void 0 : options.sum) !== null && _e !== void 0 ? _e : null;
|
|
28
|
+
this.calculateFixedTimingHour = (_f = options === null || options === void 0 ? void 0 : options.calculateFixedTimingHour) !== null && _f !== void 0 ? _f : null;
|
|
29
|
+
this.calculateFixedTimingMinute = (_g = options === null || options === void 0 ? void 0 : options.calculateFixedTimingMinute) !== null && _g !== void 0 ? _g : null;
|
|
30
|
+
this.calculateIntervalMinutes = (_h = options === null || options === void 0 ? void 0 : options.calculateIntervalMinutes) !== null && _h !== void 0 ? _h : null;
|
|
31
|
+
this.additionalScopes = (_j = options === null || options === void 0 ? void 0 : options.additionalScopes) !== null && _j !== void 0 ? _j : null;
|
|
32
|
+
this.entryPeriodEventId = (_k = options === null || options === void 0 ? void 0 : options.entryPeriodEventId) !== null && _k !== void 0 ? _k : null;
|
|
33
|
+
this.accessPeriodEventId = (_l = options === null || options === void 0 ? void 0 : options.accessPeriodEventId) !== null && _l !== void 0 ? _l : null;
|
|
34
|
+
this.ignoreUserIds = (_m = options === null || options === void 0 ? void 0 : options.ignoreUserIds) !== null && _m !== void 0 ? _m : null;
|
|
35
|
+
this.generation = (_o = options === null || options === void 0 ? void 0 : options.generation) !== null && _o !== void 0 ? _o : null;
|
|
35
36
|
}
|
|
36
37
|
static scopeIsGlobal(name, orderDirection, uniqueByUserId, calculateIntervalMinutes, options = null) {
|
|
37
|
-
return new CategoryModel(name, orderDirection, CategoryModelScope_1.CategoryModelScope.GLOBAL,
|
|
38
|
+
return new CategoryModel(name, orderDirection, CategoryModelScope_1.CategoryModelScope.GLOBAL, {
|
|
39
|
+
uniqueByUserId: uniqueByUserId,
|
|
38
40
|
calculateIntervalMinutes: calculateIntervalMinutes,
|
|
39
41
|
metadata: options === null || options === void 0 ? void 0 : options.metadata,
|
|
40
42
|
minimumValue: options === null || options === void 0 ? void 0 : options.minimumValue,
|
|
@@ -48,8 +50,8 @@ class CategoryModel {
|
|
|
48
50
|
generation: options === null || options === void 0 ? void 0 : options.generation,
|
|
49
51
|
});
|
|
50
52
|
}
|
|
51
|
-
static scopeIsScoped(name, orderDirection,
|
|
52
|
-
return new CategoryModel(name, orderDirection, CategoryModelScope_1.CategoryModelScope.SCOPED,
|
|
53
|
+
static scopeIsScoped(name, orderDirection, options = null) {
|
|
54
|
+
return new CategoryModel(name, orderDirection, CategoryModelScope_1.CategoryModelScope.SCOPED, {
|
|
53
55
|
metadata: options === null || options === void 0 ? void 0 : options.metadata,
|
|
54
56
|
minimumValue: options === null || options === void 0 ? void 0 : options.minimumValue,
|
|
55
57
|
maximumValue: options === null || options === void 0 ? void 0 : options.maximumValue,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CategoryModel.js","sourceRoot":"","sources":["CategoryModel.ts"],"names":[],"mappings":";;AAoBA,kEAA+D;AAE/D,MAAqB,aAAa;IAkB9B,YACI,IAAY,EACZ,cAA2C,EAC3C,KAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"CategoryModel.js","sourceRoot":"","sources":["CategoryModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,10 +24,10 @@ export default class CategoryModel {
|
|
|
24
24
|
private readonly name: string;
|
|
25
25
|
private readonly orderDirection: CategoryModelOrderDirection;
|
|
26
26
|
private readonly scope: CategoryModelScope;
|
|
27
|
-
private readonly uniqueByUserId: boolean;
|
|
28
27
|
private readonly metadata: string|null = null;
|
|
29
28
|
private readonly minimumValue: number|null = null;
|
|
30
29
|
private readonly maximumValue: number|null = null;
|
|
30
|
+
private readonly uniqueByUserId: boolean|null = null;
|
|
31
31
|
private readonly sum: boolean|null = null;
|
|
32
32
|
private readonly calculateFixedTimingHour: number|null = null;
|
|
33
33
|
private readonly calculateFixedTimingMinute: number|null = null;
|
|
@@ -42,16 +42,15 @@ export default class CategoryModel {
|
|
|
42
42
|
name: string,
|
|
43
43
|
orderDirection: CategoryModelOrderDirection,
|
|
44
44
|
scope: CategoryModelScope,
|
|
45
|
-
uniqueByUserId: boolean,
|
|
46
45
|
options: CategoryModelOptions|null = null,
|
|
47
46
|
) {
|
|
48
47
|
this.name = name;
|
|
49
48
|
this.orderDirection = orderDirection;
|
|
50
49
|
this.scope = scope;
|
|
51
|
-
this.uniqueByUserId = uniqueByUserId;
|
|
52
50
|
this.metadata = options?.metadata ?? null;
|
|
53
51
|
this.minimumValue = options?.minimumValue ?? null;
|
|
54
52
|
this.maximumValue = options?.maximumValue ?? null;
|
|
53
|
+
this.uniqueByUserId = options?.uniqueByUserId ?? null;
|
|
55
54
|
this.sum = options?.sum ?? null;
|
|
56
55
|
this.calculateFixedTimingHour = options?.calculateFixedTimingHour ?? null;
|
|
57
56
|
this.calculateFixedTimingMinute = options?.calculateFixedTimingMinute ?? null;
|
|
@@ -74,8 +73,8 @@ export default class CategoryModel {
|
|
|
74
73
|
name,
|
|
75
74
|
orderDirection,
|
|
76
75
|
CategoryModelScope.GLOBAL,
|
|
77
|
-
uniqueByUserId,
|
|
78
76
|
{
|
|
77
|
+
uniqueByUserId: uniqueByUserId,
|
|
79
78
|
calculateIntervalMinutes: calculateIntervalMinutes,
|
|
80
79
|
metadata: options?.metadata,
|
|
81
80
|
minimumValue: options?.minimumValue,
|
|
@@ -94,14 +93,12 @@ export default class CategoryModel {
|
|
|
94
93
|
public static scopeIsScoped(
|
|
95
94
|
name: string,
|
|
96
95
|
orderDirection: CategoryModelOrderDirection,
|
|
97
|
-
uniqueByUserId: boolean,
|
|
98
96
|
options: CategoryModelScopeIsScopedOptions|null = null,
|
|
99
97
|
): CategoryModel {
|
|
100
98
|
return new CategoryModel(
|
|
101
99
|
name,
|
|
102
100
|
orderDirection,
|
|
103
101
|
CategoryModelScope.SCOPED,
|
|
104
|
-
uniqueByUserId,
|
|
105
102
|
{
|
|
106
103
|
metadata: options?.metadata,
|
|
107
104
|
minimumValue: options?.minimumValue,
|
|
@@ -3,6 +3,7 @@ export interface CategoryModelOptions {
|
|
|
3
3
|
metadata?: string | null;
|
|
4
4
|
minimumValue?: number | null;
|
|
5
5
|
maximumValue?: number | null;
|
|
6
|
+
uniqueByUserId?: boolean | null;
|
|
6
7
|
sum?: boolean | null;
|
|
7
8
|
calculateFixedTimingHour?: number | null;
|
|
8
9
|
calculateFixedTimingMinute?: number | null;
|
|
@@ -21,6 +21,7 @@ export interface CategoryModelOptions {
|
|
|
21
21
|
metadata?: string|null;
|
|
22
22
|
minimumValue?: number|null;
|
|
23
23
|
maximumValue?: number|null;
|
|
24
|
+
uniqueByUserId?: boolean|null;
|
|
24
25
|
sum?: boolean|null;
|
|
25
26
|
calculateFixedTimingHour?: number|null;
|
|
26
27
|
calculateFixedTimingMinute?: number|null;
|