gs2 1.3.174 → 1.3.176

package/formation/model/FormModel.ts

@@ -16,7 +16,7 @@ permissions and limitations under the License.
 
 import IModel from '../../core/interface/IModel';
 import SlotModel from './SlotModel';
-const grnFormat: string = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{moldModelName}:model:form:{formModelName}";
+const grnFormat: string = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{moldModelName}:form";
 
 export default class FormModel implements IModel {
     private formModelId: string|null = null;
@@ -30,7 +30,6 @@ export default class FormModel implements IModel {
             .replace('{ownerId}', '.*')
             .replace('{namespaceName}', '.*')
             .replace('{moldModelName}', '.*')
-            .replace('{formModelName}', '.*')
         );
         if (match) {
             return match[1];
@@ -44,7 +43,6 @@ export default class FormModel implements IModel {
             .replace('{ownerId}', '(.*)')
             .replace('{namespaceName}', '.*')
             .replace('{moldModelName}', '.*')
-            .replace('{formModelName}', '.*')
         );
         if (match) {
             return match[1];
@@ -58,7 +56,6 @@ export default class FormModel implements IModel {
             .replace('{ownerId}', '.*')
             .replace('{namespaceName}', '(.*)')
             .replace('{moldModelName}', '.*')
-            .replace('{formModelName}', '.*')
         );
         if (match) {
             return match[1];
@@ -72,21 +69,6 @@ export default class FormModel implements IModel {
             .replace('{ownerId}', '.*')
             .replace('{namespaceName}', '.*')
             .replace('{moldModelName}', '(.*)')
-            .replace('{formModelName}', '.*')
-        );
-        if (match) {
-            return match[1];
-        }
-        return null;
-    }
-
-    public static getFormModelName(grn: string): string|null {
-        const match = grn.match(grnFormat
-            .replace('{region}', '.*')
-            .replace('{ownerId}', '.*')
-            .replace('{namespaceName}', '.*')
-            .replace('{moldModelName}', '.*')
-            .replace('{formModelName}', '(.*)')
         );
         if (match) {
             return match[1];
@@ -107,9 +89,6 @@ export default class FormModel implements IModel {
         if (this.getMoldModelName(grn) == null || this.getMoldModelName(grn) === '') {
             return false;
         }
-        if (this.getFormModelName(grn) == null || this.getFormModelName(grn) === '') {
-            return false;
-        }
         return true;
     }
 
@@ -118,14 +97,12 @@ export default class FormModel implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
         moldModelName: string|null,
-        formModelName: string|null,
     ): string|null {
         return grnFormat
             .replace('{region}', region ?? '')
             .replace('{ownerId}', ownerId ?? '')
             .replace('{namespaceName}', namespaceName ?? '')
-            .replace('{moldModelName}', moldModelName ?? '')
-            .replace('{formModelName}', formModelName ?? '');
+            .replace('{moldModelName}', moldModelName ?? '');
     }
     public getFormModelId(): string|null {
         return this.formModelId;

package/lottery/model/BoxItem.d.ts

@@ -1,9 +1,13 @@
 import IModel from '../../core/interface/IModel';
 import AcquireAction from './AcquireAction';
 export default class BoxItem implements IModel {
+    private prizeId;
     private acquireActions;
     private remaining;
     private initial;
+    getPrizeId(): string | null;
+    setPrizeId(prizeId: string | null): this;
+    withPrizeId(prizeId: string | null): this;
     getAcquireActions(): AcquireAction[] | null;
     setAcquireActions(acquireActions: AcquireAction[] | null): this;
     withAcquireActions(acquireActions: AcquireAction[] | null): this;

package/lottery/model/BoxItem.js

@@ -19,10 +19,22 @@ var tslib_1 = require("tslib");
 var AcquireAction_1 = tslib_1.__importDefault(require("./AcquireAction"));
 var BoxItem = /** @class */ (function () {
     function BoxItem() {
+        this.prizeId = null;
         this.acquireActions = null;
         this.remaining = null;
         this.initial = null;
     }
+    BoxItem.prototype.getPrizeId = function () {
+        return this.prizeId;
+    };
+    BoxItem.prototype.setPrizeId = function (prizeId) {
+        this.prizeId = prizeId;
+        return this;
+    };
+    BoxItem.prototype.withPrizeId = function (prizeId) {
+        this.prizeId = prizeId;
+        return this;
+    };
     BoxItem.prototype.getAcquireActions = function () {
         return this.acquireActions;
     };
@@ -61,6 +73,7 @@ var BoxItem = /** @class */ (function () {
             return null;
         }
         return new BoxItem()
+            .withPrizeId(data["prizeId"])
             .withAcquireActions(data.acquireActions ?
             data.acquireActions.map(function (item) {
                 return AcquireAction_1.default.fromDict(item);
@@ -70,6 +83,7 @@ var BoxItem = /** @class */ (function () {
     };
     BoxItem.prototype.toDict = function () {
         return {
+            "prizeId": this.getPrizeId(),
             "acquireActions": this.getAcquireActions() ?
                 this.getAcquireActions().map(function (item) {
                     return item.toDict();

package/lottery/model/BoxItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"BoxItem.js","sourceRoot":"","sources":["BoxItem.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,0EAA4C;AAE5C;IAAA;QACY,mBAAc,GAAyB,IAAI,CAAC;QAC5C,cAAS,GAAgB,IAAI,CAAC;QAC9B,YAAO,GAAgB,IAAI,CAAC;IA4DxC,CAAC;IA3DU,mCAAiB,GAAxB;QACI,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACM,mCAAiB,GAAxB,UAAyB,cAAoC;QACzD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,oCAAkB,GAAzB,UAA0B,cAAoC;QAC1D,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,8BAAY,GAAnB;QACI,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IACM,8BAAY,GAAnB,UAAoB,SAAsB;QACtC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,+BAAa,GAApB,UAAqB,SAAsB;QACvC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,4BAAU,GAAjB;QACI,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACM,4BAAU,GAAjB,UAAkB,OAAoB;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,6BAAW,GAAlB,UAAmB,OAAoB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,gBAAQ,GAAtB,UAAuB,IAA0B;QAC7C,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,OAAO,EAAE;aACf,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACrC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAC,IAA0B;gBAC/C,OAAO,uBAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE,CAAC;aACN,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAChC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACtC,CAAC;IAEM,wBAAM,GAAb;QACI,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;gBACxC,IAAI,CAAC,iBAAiB,EAAG,CAAC,GAAG,CAAC,UAAC,IAAmB;oBAC9C,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE;YACN,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE;YAChC,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE;SAC/B,CAAC;IACN,CAAC;IACL,cAAC;AAAD,CAAC,AA/DD,IA+DC"}
+{"version":3,"file":"BoxItem.js","sourceRoot":"","sources":["BoxItem.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,0EAA4C;AAE5C;IAAA;QACY,YAAO,GAAgB,IAAI,CAAC;QAC5B,mBAAc,GAAyB,IAAI,CAAC;QAC5C,cAAS,GAAgB,IAAI,CAAC;QAC9B,YAAO,GAAgB,IAAI,CAAC;IAyExC,CAAC;IAxEU,4BAAU,GAAjB;QACI,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACM,4BAAU,GAAjB,UAAkB,OAAoB;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,6BAAW,GAAlB,UAAmB,OAAoB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,mCAAiB,GAAxB;QACI,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACM,mCAAiB,GAAxB,UAAyB,cAAoC;QACzD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,oCAAkB,GAAzB,UAA0B,cAAoC;QAC1D,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,8BAAY,GAAnB;QACI,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IACM,8BAAY,GAAnB,UAAoB,SAAsB;QACtC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,+BAAa,GAApB,UAAqB,SAAsB;QACvC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,4BAAU,GAAjB;QACI,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACM,4BAAU,GAAjB,UAAkB,OAAoB;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,6BAAW,GAAlB,UAAmB,OAAoB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,gBAAQ,GAAtB,UAAuB,IAA0B;QAC7C,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,OAAO,EAAE;aACf,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC5B,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACrC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAC,IAA0B;gBAC/C,OAAO,uBAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE,CAAC;aACN,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAChC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACtC,CAAC;IAEM,wBAAM,GAAb;QACI,OAAO;YACH,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE;YAC5B,gBAAgB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;gBACxC,IAAI,CAAC,iBAAiB,EAAG,CAAC,GAAG,CAAC,UAAC,IAAmB;oBAC9C,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE;YACN,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE;YAChC,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE;SAC/B,CAAC;IACN,CAAC;IACL,cAAC;AAAD,CAAC,AA7ED,IA6EC"}

package/lottery/model/BoxItem.ts

@@ -18,9 +18,21 @@ import IModel from '../../core/interface/IModel';
 import AcquireAction from './AcquireAction';
 
 export default class BoxItem implements IModel {
+    private prizeId: string|null = null;
     private acquireActions: AcquireAction[]|null = null;
     private remaining: number|null = null;
     private initial: number|null = null;
+    public getPrizeId(): string|null {
+        return this.prizeId;
+    }
+    public setPrizeId(prizeId: string|null) {
+        this.prizeId = prizeId;
+        return this;
+    }
+    public withPrizeId(prizeId: string|null): this {
+        this.prizeId = prizeId;
+        return this;
+    }
     public getAcquireActions(): AcquireAction[]|null {
         return this.acquireActions;
     }
@@ -60,6 +72,7 @@ export default class BoxItem implements IModel {
             return null;
         }
         return new BoxItem()
+            .withPrizeId(data["prizeId"])
             .withAcquireActions(data.acquireActions ?
                 data.acquireActions.map((item: {[key: string]: any}) => {
                     return AcquireAction.fromDict(item);
@@ -71,6 +84,7 @@ export default class BoxItem implements IModel {
 
     public toDict(): {[key: string]: any} {
         return {
+            "prizeId": this.getPrizeId(),
             "acquireActions": this.getAcquireActions() ?
                 this.getAcquireActions()!.map((item: AcquireAction) => {
                     return item.toDict();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gs2",
-  "version": "1.3.174",
+  "version": "1.3.176",
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build"