gs2 1.3.156 → 1.3.157

package/package.json

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

package/ranking/model/CategoryModel.d.ts

@@ -1,4 +1,5 @@
 import IModel from '../../core/interface/IModel';
+import Scope from './Scope';
 export default class CategoryModel implements IModel {
     private categoryModelId;
     private name;
@@ -12,6 +13,7 @@ export default class CategoryModel implements IModel {
     private calculateFixedTimingHour;
     private calculateFixedTimingMinute;
     private calculateIntervalMinutes;
+    private additionalScopes;
     private entryPeriodEventId;
     private accessPeriodEventId;
     private ignoreUserIds;
@@ -58,6 +60,9 @@ export default class CategoryModel implements IModel {
     getCalculateIntervalMinutes(): number | null;
     setCalculateIntervalMinutes(calculateIntervalMinutes: number | null): this;
     withCalculateIntervalMinutes(calculateIntervalMinutes: number | null): this;
+    getAdditionalScopes(): Scope[] | null;
+    setAdditionalScopes(additionalScopes: Scope[] | null): this;
+    withAdditionalScopes(additionalScopes: Scope[] | null): this;
     getEntryPeriodEventId(): string | null;
     setEntryPeriodEventId(entryPeriodEventId: string | null): this;
     withEntryPeriodEventId(entryPeriodEventId: string | null): this;

package/ranking/model/CategoryModel.js

@@ -15,6 +15,8 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var Scope_1 = tslib_1.__importDefault(require("./Scope"));
 var grnFormat = "grn:gs2:{region}:{ownerId}:ranking:{namespaceName}:categoryModel:{categoryName}";
 var CategoryModel = /** @class */ (function () {
     function CategoryModel() {
@@ -30,6 +32,7 @@ var CategoryModel = /** @class */ (function () {
         this.calculateFixedTimingHour = null;
         this.calculateFixedTimingMinute = null;
         this.calculateIntervalMinutes = null;
+        this.additionalScopes = null;
         this.entryPeriodEventId = null;
         this.accessPeriodEventId = null;
         this.ignoreUserIds = null;
@@ -233,6 +236,17 @@ var CategoryModel = /** @class */ (function () {
         this.calculateIntervalMinutes = calculateIntervalMinutes;
         return this;
     };
+    CategoryModel.prototype.getAdditionalScopes = function () {
+        return this.additionalScopes;
+    };
+    CategoryModel.prototype.setAdditionalScopes = function (additionalScopes) {
+        this.additionalScopes = additionalScopes;
+        return this;
+    };
+    CategoryModel.prototype.withAdditionalScopes = function (additionalScopes) {
+        this.additionalScopes = additionalScopes;
+        return this;
+    };
     CategoryModel.prototype.getEntryPeriodEventId = function () {
         return this.entryPeriodEventId;
     };
@@ -294,6 +308,10 @@ var CategoryModel = /** @class */ (function () {
             .withCalculateFixedTimingHour(data["calculateFixedTimingHour"])
             .withCalculateFixedTimingMinute(data["calculateFixedTimingMinute"])
             .withCalculateIntervalMinutes(data["calculateIntervalMinutes"])
+            .withAdditionalScopes(data.additionalScopes ?
+            data.additionalScopes.map(function (item) {
+                return Scope_1.default.fromDict(item);
+            }) : [])
             .withEntryPeriodEventId(data["entryPeriodEventId"])
             .withAccessPeriodEventId(data["accessPeriodEventId"])
             .withIgnoreUserIds(data.ignoreUserIds ?
@@ -316,6 +334,10 @@ var CategoryModel = /** @class */ (function () {
             "calculateFixedTimingHour": this.getCalculateFixedTimingHour(),
             "calculateFixedTimingMinute": this.getCalculateFixedTimingMinute(),
             "calculateIntervalMinutes": this.getCalculateIntervalMinutes(),
+            "additionalScopes": this.getAdditionalScopes() ?
+                this.getAdditionalScopes().map(function (item) {
+                    return item.toDict();
+                }) : [],
             "entryPeriodEventId": this.getEntryPeriodEventId(),
             "accessPeriodEventId": this.getAccessPeriodEventId(),
             "ignoreUserIds": this.getIgnoreUserIds() ?

package/ranking/model/CategoryModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"CategoryModel.js","sourceRoot":"","sources":["CategoryModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CategoryModel.js","sourceRoot":"","sources":["CategoryModel.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,0DAA4B;AAC5B,IAAM,SAAS,GAAW,iFAAiF,CAAC;AAE5G;IAAA;QACY,oBAAe,GAAgB,IAAI,CAAC;QACpC,SAAI,GAAgB,IAAI,CAAC;QACzB,aAAQ,GAAgB,IAAI,CAAC;QAC7B,iBAAY,GAAgB,IAAI,CAAC;QACjC,iBAAY,GAAgB,IAAI,CAAC;QACjC,mBAAc,GAAgB,IAAI,CAAC;QACnC,UAAK,GAAgB,IAAI,CAAC;QAC1B,mBAAc,GAAiB,IAAI,CAAC;QACpC,QAAG,GAAiB,IAAI,CAAC;QACzB,6BAAwB,GAAgB,IAAI,CAAC;QAC7C,+BAA0B,GAAgB,IAAI,CAAC;QAC/C,6BAAwB,GAAgB,IAAI,CAAC;QAC7C,qBAAgB,GAAiB,IAAI,CAAC;QACtC,uBAAkB,GAAgB,IAAI,CAAC;QACvC,wBAAmB,GAAgB,IAAI,CAAC;QACxC,kBAAa,GAAkB,IAAI,CAAC;QACpC,eAAU,GAAgB,IAAI,CAAC;IA2U3C,CAAC;IAzUiB,uBAAS,GAAvB,UAAwB,GAAW;QAC/B,IAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS;aAC5B,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC;aAC3B,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC;aAC1B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;aAChC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CACnC,CAAC;QACF,IAAI,KAAK,EAAE;YACP,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;SACnB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,wBAAU,GAAxB,UAAyB,GAAW;QAChC,IAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS;aAC5B,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC;aACzB,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC;aAC5B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;aAChC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CACnC,CAAC;QACF,IAAI,KAAK,EAAE;YACP,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;SACnB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,8BAAgB,GAA9B,UAA+B,GAAW;QACtC,IAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS;aAC5B,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC;aACzB,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC;aAC1B,OAAO,CAAC,iBAAiB,EAAE,MAAM,CAAC;aAClC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CACnC,CAAC;QACF,IAAI,KAAK,EAAE;YACP,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;SACnB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,6BAAe,GAA7B,UAA8B,GAAW;QACrC,IAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS;aAC5B,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC;aACzB,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC;aAC1B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;aAChC,OAAO,CAAC,gBAAgB,EAAE,MAAM,CAAC,CACrC,CAAC;QACF,IAAI,KAAK,EAAE;YACP,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;SACnB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,qBAAO,GAArB,UAAsB,GAAW;QAC7B,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE;YAC3D,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE;YAC7D,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE;YACzE,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE;YACvE,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,uBAAS,GAAvB,UACI,MAAmB,EACnB,OAAoB,EACpB,aAA0B,EAC1B,YAAyB;QAEzB,OAAO,SAAS;aACX,OAAO,CAAC,UAAU,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;aACjC,OAAO,CAAC,WAAW,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;aACnC,OAAO,CAAC,iBAAiB,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,EAAE,CAAC;aAC/C,OAAO,CAAC,gBAAgB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC,CAAC;IACvD,CAAC;IACM,0CAAkB,GAAzB;QACI,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IACM,0CAAkB,GAAzB,UAA0B,eAA4B;QAClD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,2CAAmB,GAA1B,UAA2B,eAA4B;QACnD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,+BAAO,GAAd;QACI,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IACM,+BAAO,GAAd,UAAe,IAAiB;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,gCAAQ,GAAf,UAAgB,IAAiB;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,mCAAW,GAAlB;QACI,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACM,mCAAW,GAAlB,UAAmB,QAAqB;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,oCAAY,GAAnB,UAAoB,QAAqB;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,uCAAe,GAAtB;QACI,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IACM,uCAAe,GAAtB,UAAuB,YAAyB;QAC5C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,wCAAgB,GAAvB,UAAwB,YAAyB;QAC7C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,uCAAe,GAAtB;QACI,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IACM,uCAAe,GAAtB,UAAuB,YAAyB;QAC5C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,wCAAgB,GAAvB,UAAwB,YAAyB;QAC7C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,yCAAiB,GAAxB;QACI,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACM,yCAAiB,GAAxB,UAAyB,cAA2B;QAChD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,0CAAkB,GAAzB,UAA0B,cAA2B;QACjD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,gCAAQ,GAAf;QACI,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IACM,gCAAQ,GAAf,UAAgB,KAAkB;QAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,iCAAS,GAAhB,UAAiB,KAAkB;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,yCAAiB,GAAxB;QACI,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACM,yCAAiB,GAAxB,UAAyB,cAA4B;QACjD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,0CAAkB,GAAzB,UAA0B,cAA4B;QAClD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,8BAAM,GAAb;QACI,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IACM,8BAAM,GAAb,UAAc,GAAiB;QAC3B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,+BAAO,GAAd,UAAe,GAAiB;QAC5B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,mDAA2B,GAAlC;QACI,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACzC,CAAC;IACM,mDAA2B,GAAlC,UAAmC,wBAAqC;QACpE,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,oDAA4B,GAAnC,UAAoC,wBAAqC;QACrE,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,qDAA6B,GAApC;QACI,OAAO,IAAI,CAAC,0BAA0B,CAAC;IAC3C,CAAC;IACM,qDAA6B,GAApC,UAAqC,0BAAuC;QACxE,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;QAC7D,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,sDAA8B,GAArC,UAAsC,0BAAuC;QACzE,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;QAC7D,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,mDAA2B,GAAlC;QACI,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACzC,CAAC;IACM,mDAA2B,GAAlC,UAAmC,wBAAqC;QACpE,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,oDAA4B,GAAnC,UAAoC,wBAAqC;QACrE,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,2CAAmB,GAA1B;QACI,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IACM,2CAAmB,GAA1B,UAA2B,gBAA8B;QACrD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,4CAAoB,GAA3B,UAA4B,gBAA8B;QACtD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,6CAAqB,GAA5B;QACI,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IACM,6CAAqB,GAA5B,UAA6B,kBAA+B;QACxD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,8CAAsB,GAA7B,UAA8B,kBAA+B;QACzD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,8CAAsB,GAA7B;QACI,OAAO,IAAI,CAAC,mBAAmB,CAAC;IACpC,CAAC;IACM,8CAAsB,GAA7B,UAA8B,mBAAgC;QAC1D,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,+CAAuB,GAA9B,UAA+B,mBAAgC;QAC3D,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,wCAAgB,GAAvB;QACI,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IACM,wCAAgB,GAAvB,UAAwB,aAA4B;QAChD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,yCAAiB,GAAxB,UAAyB,aAA4B;QACjD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,qCAAa,GAApB;QACI,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IACM,qCAAa,GAApB,UAAqB,UAAuB;QACxC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,sCAAc,GAArB,UAAsB,UAAuB;QACzC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,sBAAQ,GAAtB,UAAuB,IAA0B;QAC7C,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,aAAa,EAAE;aACrB,mBAAmB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;aAC5C,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtB,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC9B,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACtC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACtC,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aAC1C,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACxB,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aAC1C,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACpB,4BAA4B,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;aAC9D,8BAA8B,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;aAClE,4BAA4B,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;aAC9D,oBAAoB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACzC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAC,IAA0B;gBACjD,OAAO,eAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE,CAAC;aACN,sBAAsB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;aAClD,uBAAuB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;aACpD,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACnC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAC,IAA0B;gBAC9C,OAAO,IAAI,CAAC;YAChB,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE,CAAC;aACN,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAC5C,CAAC;IAEM,8BAAM,GAAb;QACI,OAAO;YACH,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE;YAC5C,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE;YACtB,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE;YAC9B,cAAc,EAAE,IAAI,CAAC,eAAe,EAAE;YACtC,cAAc,EAAE,IAAI,CAAC,eAAe,EAAE;YACtC,gBAAgB,EAAE,IAAI,CAAC,iBAAiB,EAAE;YAC1C,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;YACxB,gBAAgB,EAAE,IAAI,CAAC,iBAAiB,EAAE;YAC1C,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;YACpB,0BAA0B,EAAE,IAAI,CAAC,2BAA2B,EAAE;YAC9D,4BAA4B,EAAE,IAAI,CAAC,6BAA6B,EAAE;YAClE,0BAA0B,EAAE,IAAI,CAAC,2BAA2B,EAAE;YAC9D,kBAAkB,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;gBAC5C,IAAI,CAAC,mBAAmB,EAAG,CAAC,GAAG,CAAC,UAAC,IAAW;oBACxC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE;YACN,oBAAoB,EAAE,IAAI,CAAC,qBAAqB,EAAE;YAClD,qBAAqB,EAAE,IAAI,CAAC,sBAAsB,EAAE;YACpD,eAAe,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;gBACtC,IAAI,CAAC,gBAAgB,EAAG,CAAC,GAAG,CAAC,UAAC,IAAY;oBACtC,OAAO,IAAI,CAAC;gBAChB,CAAC,CACJ,CAAC,CAAC,CAAC,EAAE;YACN,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE;SACrC,CAAC;IACN,CAAC;IACL,oBAAC;AAAD,CAAC,AA5VD,IA4VC"}

package/ranking/model/CategoryModel.ts

@@ -15,6 +15,7 @@ permissions and limitations under the License.
  */
 
 import IModel from '../../core/interface/IModel';
+import Scope from './Scope';
 const grnFormat: string = "grn:gs2:{region}:{ownerId}:ranking:{namespaceName}:categoryModel:{categoryName}";
 
 export default class CategoryModel implements IModel {
@@ -30,6 +31,7 @@ export default class CategoryModel implements IModel {
     private calculateFixedTimingHour: number|null = null;
     private calculateFixedTimingMinute: number|null = null;
     private calculateIntervalMinutes: number|null = null;
+    private additionalScopes: Scope[]|null = null;
     private entryPeriodEventId: string|null = null;
     private accessPeriodEventId: string|null = null;
     private ignoreUserIds: string[]|null = null;
@@ -247,6 +249,17 @@ export default class CategoryModel implements IModel {
         this.calculateIntervalMinutes = calculateIntervalMinutes;
         return this;
     }
+    public getAdditionalScopes(): Scope[]|null {
+        return this.additionalScopes;
+    }
+    public setAdditionalScopes(additionalScopes: Scope[]|null) {
+        this.additionalScopes = additionalScopes;
+        return this;
+    }
+    public withAdditionalScopes(additionalScopes: Scope[]|null): this {
+        this.additionalScopes = additionalScopes;
+        return this;
+    }
     public getEntryPeriodEventId(): string|null {
         return this.entryPeriodEventId;
     }
@@ -309,6 +322,11 @@ export default class CategoryModel implements IModel {
             .withCalculateFixedTimingHour(data["calculateFixedTimingHour"])
             .withCalculateFixedTimingMinute(data["calculateFixedTimingMinute"])
             .withCalculateIntervalMinutes(data["calculateIntervalMinutes"])
+            .withAdditionalScopes(data.additionalScopes ?
+                data.additionalScopes.map((item: {[key: string]: any}) => {
+                    return Scope.fromDict(item);
+                }
+            ) : [])
             .withEntryPeriodEventId(data["entryPeriodEventId"])
             .withAccessPeriodEventId(data["accessPeriodEventId"])
             .withIgnoreUserIds(data.ignoreUserIds ?
@@ -333,6 +351,11 @@ export default class CategoryModel implements IModel {
             "calculateFixedTimingHour": this.getCalculateFixedTimingHour(),
             "calculateFixedTimingMinute": this.getCalculateFixedTimingMinute(),
             "calculateIntervalMinutes": this.getCalculateIntervalMinutes(),
+            "additionalScopes": this.getAdditionalScopes() ?
+                this.getAdditionalScopes()!.map((item: Scope) => {
+                    return item.toDict();
+                }
+            ) : [],
             "entryPeriodEventId": this.getEntryPeriodEventId(),
             "accessPeriodEventId": this.getAccessPeriodEventId(),
             "ignoreUserIds": this.getIgnoreUserIds() ?

package/ranking/model/CategoryModelMaster.d.ts

@@ -1,4 +1,5 @@
 import IModel from '../../core/interface/IModel';
+import Scope from './Scope';
 export default class CategoryModelMaster implements IModel {
     private categoryModelId;
     private name;
@@ -13,6 +14,7 @@ export default class CategoryModelMaster implements IModel {
     private calculateFixedTimingHour;
     private calculateFixedTimingMinute;
     private calculateIntervalMinutes;
+    private additionalScopes;
     private entryPeriodEventId;
     private accessPeriodEventId;
     private ignoreUserIds;
@@ -64,6 +66,9 @@ export default class CategoryModelMaster implements IModel {
     getCalculateIntervalMinutes(): number | null;
     setCalculateIntervalMinutes(calculateIntervalMinutes: number | null): this;
     withCalculateIntervalMinutes(calculateIntervalMinutes: number | null): this;
+    getAdditionalScopes(): Scope[] | null;
+    setAdditionalScopes(additionalScopes: Scope[] | null): this;
+    withAdditionalScopes(additionalScopes: Scope[] | null): this;
     getEntryPeriodEventId(): string | null;
     setEntryPeriodEventId(entryPeriodEventId: string | null): this;
     withEntryPeriodEventId(entryPeriodEventId: string | null): this;

package/ranking/model/CategoryModelMaster.js

@@ -15,6 +15,8 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var Scope_1 = tslib_1.__importDefault(require("./Scope"));
 var grnFormat = "grn:gs2:{region}:{ownerId}:ranking:{namespaceName}:categoryModelMaster:{categoryName}";
 var CategoryModelMaster = /** @class */ (function () {
     function CategoryModelMaster() {
@@ -31,6 +33,7 @@ var CategoryModelMaster = /** @class */ (function () {
         this.calculateFixedTimingHour = null;
         this.calculateFixedTimingMinute = null;
         this.calculateIntervalMinutes = null;
+        this.additionalScopes = null;
         this.entryPeriodEventId = null;
         this.accessPeriodEventId = null;
         this.ignoreUserIds = null;
@@ -247,6 +250,17 @@ var CategoryModelMaster = /** @class */ (function () {
         this.calculateIntervalMinutes = calculateIntervalMinutes;
         return this;
     };
+    CategoryModelMaster.prototype.getAdditionalScopes = function () {
+        return this.additionalScopes;
+    };
+    CategoryModelMaster.prototype.setAdditionalScopes = function (additionalScopes) {
+        this.additionalScopes = additionalScopes;
+        return this;
+    };
+    CategoryModelMaster.prototype.withAdditionalScopes = function (additionalScopes) {
+        this.additionalScopes = additionalScopes;
+        return this;
+    };
     CategoryModelMaster.prototype.getEntryPeriodEventId = function () {
         return this.entryPeriodEventId;
     };
@@ -331,6 +345,10 @@ var CategoryModelMaster = /** @class */ (function () {
             .withCalculateFixedTimingHour(data["calculateFixedTimingHour"])
             .withCalculateFixedTimingMinute(data["calculateFixedTimingMinute"])
             .withCalculateIntervalMinutes(data["calculateIntervalMinutes"])
+            .withAdditionalScopes(data.additionalScopes ?
+            data.additionalScopes.map(function (item) {
+                return Scope_1.default.fromDict(item);
+            }) : [])
             .withEntryPeriodEventId(data["entryPeriodEventId"])
             .withAccessPeriodEventId(data["accessPeriodEventId"])
             .withIgnoreUserIds(data.ignoreUserIds ?
@@ -356,6 +374,10 @@ var CategoryModelMaster = /** @class */ (function () {
             "calculateFixedTimingHour": this.getCalculateFixedTimingHour(),
             "calculateFixedTimingMinute": this.getCalculateFixedTimingMinute(),
             "calculateIntervalMinutes": this.getCalculateIntervalMinutes(),
+            "additionalScopes": this.getAdditionalScopes() ?
+                this.getAdditionalScopes().map(function (item) {
+                    return item.toDict();
+                }) : [],
             "entryPeriodEventId": this.getEntryPeriodEventId(),
             "accessPeriodEventId": this.getAccessPeriodEventId(),
             "ignoreUserIds": this.getIgnoreUserIds() ?

package/ranking/model/CategoryModelMaster.js.map

@@ -1 +1 @@
-{"version":3,"file":"CategoryModelMaster.js","sourceRoot":"","sources":["CategoryModelMaster.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CategoryModelMaster.js","sourceRoot":"","sources":["CategoryModelMaster.ts"],"names":[],"mappings":"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"}

package/ranking/model/CategoryModelMaster.ts

@@ -15,6 +15,7 @@ permissions and limitations under the License.
  */
 
 import IModel from '../../core/interface/IModel';
+import Scope from './Scope';
 const grnFormat: string = "grn:gs2:{region}:{ownerId}:ranking:{namespaceName}:categoryModelMaster:{categoryName}";
 
 export default class CategoryModelMaster implements IModel {
@@ -31,6 +32,7 @@ export default class CategoryModelMaster implements IModel {
     private calculateFixedTimingHour: number|null = null;
     private calculateFixedTimingMinute: number|null = null;
     private calculateIntervalMinutes: number|null = null;
+    private additionalScopes: Scope[]|null = null;
     private entryPeriodEventId: string|null = null;
     private accessPeriodEventId: string|null = null;
     private ignoreUserIds: string[]|null = null;
@@ -261,6 +263,17 @@ export default class CategoryModelMaster implements IModel {
         this.calculateIntervalMinutes = calculateIntervalMinutes;
         return this;
     }
+    public getAdditionalScopes(): Scope[]|null {
+        return this.additionalScopes;
+    }
+    public setAdditionalScopes(additionalScopes: Scope[]|null) {
+        this.additionalScopes = additionalScopes;
+        return this;
+    }
+    public withAdditionalScopes(additionalScopes: Scope[]|null): this {
+        this.additionalScopes = additionalScopes;
+        return this;
+    }
     public getEntryPeriodEventId(): string|null {
         return this.entryPeriodEventId;
     }
@@ -346,6 +359,11 @@ export default class CategoryModelMaster implements IModel {
             .withCalculateFixedTimingHour(data["calculateFixedTimingHour"])
             .withCalculateFixedTimingMinute(data["calculateFixedTimingMinute"])
             .withCalculateIntervalMinutes(data["calculateIntervalMinutes"])
+            .withAdditionalScopes(data.additionalScopes ?
+                data.additionalScopes.map((item: {[key: string]: any}) => {
+                    return Scope.fromDict(item);
+                }
+            ) : [])
             .withEntryPeriodEventId(data["entryPeriodEventId"])
             .withAccessPeriodEventId(data["accessPeriodEventId"])
             .withIgnoreUserIds(data.ignoreUserIds ?
@@ -373,6 +391,11 @@ export default class CategoryModelMaster implements IModel {
             "calculateFixedTimingHour": this.getCalculateFixedTimingHour(),
             "calculateFixedTimingMinute": this.getCalculateFixedTimingMinute(),
             "calculateIntervalMinutes": this.getCalculateIntervalMinutes(),
+            "additionalScopes": this.getAdditionalScopes() ?
+                this.getAdditionalScopes()!.map((item: Scope) => {
+                    return item.toDict();
+                }
+            ) : [],
             "entryPeriodEventId": this.getEntryPeriodEventId(),
             "accessPeriodEventId": this.getAccessPeriodEventId(),
             "ignoreUserIds": this.getIgnoreUserIds() ?

package/ranking/model/Scope.d.ts

@@ -0,0 +1,17 @@
+import IModel from '../../core/interface/IModel';
+export default class Scope implements IModel {
+    private name;
+    private targetDays;
+    getName(): string | null;
+    setName(name: string | null): this;
+    withName(name: string | null): this;
+    getTargetDays(): number | null;
+    setTargetDays(targetDays: number | null): this;
+    withTargetDays(targetDays: number | null): this;
+    static fromDict(data: {
+        [key: string]: any;
+    }): Scope | null;
+    toDict(): {
+        [key: string]: any;
+    };
+}

package/ranking/model/Scope.js

@@ -0,0 +1,62 @@
+"use strict";
+/*
+Copyright 2016 Game Server Services, Inc. or its affiliates. All Rights
+Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License").
+You may not use this file except in compliance with the License.
+A copy of the License is located at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+or in the "license" file accompanying this file. This file is distributed
+on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+express or implied. See the License for the specific language governing
+permissions and limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var Scope = /** @class */ (function () {
+    function Scope() {
+        this.name = null;
+        this.targetDays = null;
+    }
+    Scope.prototype.getName = function () {
+        return this.name;
+    };
+    Scope.prototype.setName = function (name) {
+        this.name = name;
+        return this;
+    };
+    Scope.prototype.withName = function (name) {
+        this.name = name;
+        return this;
+    };
+    Scope.prototype.getTargetDays = function () {
+        return this.targetDays;
+    };
+    Scope.prototype.setTargetDays = function (targetDays) {
+        this.targetDays = targetDays;
+        return this;
+    };
+    Scope.prototype.withTargetDays = function (targetDays) {
+        this.targetDays = targetDays;
+        return this;
+    };
+    Scope.fromDict = function (data) {
+        if (data == undefined || data == null) {
+            return null;
+        }
+        return new Scope()
+            .withName(data["name"])
+            .withTargetDays(data["targetDays"]);
+    };
+    Scope.prototype.toDict = function () {
+        return {
+            "name": this.getName(),
+            "targetDays": this.getTargetDays(),
+        };
+    };
+    return Scope;
+}());
+exports.default = Scope;
+//# sourceMappingURL=Scope.js.map

package/ranking/model/Scope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Scope.js","sourceRoot":"","sources":["Scope.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAIH;IAAA;QACY,SAAI,GAAgB,IAAI,CAAC;QACzB,eAAU,GAAgB,IAAI,CAAC;IAuC3C,CAAC;IAtCU,uBAAO,GAAd;QACI,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IACM,uBAAO,GAAd,UAAe,IAAiB;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,wBAAQ,GAAf,UAAgB,IAAiB;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,6BAAa,GAApB;QACI,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IACM,6BAAa,GAApB,UAAqB,UAAuB;QACxC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,8BAAc,GAArB,UAAsB,UAAuB;QACzC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,cAAQ,GAAtB,UAAuB,IAA0B;QAC7C,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,KAAK,EAAE;aACb,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtB,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAC5C,CAAC;IAEM,sBAAM,GAAb;QACI,OAAO;YACH,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE;YACtB,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE;SACrC,CAAC;IACN,CAAC;IACL,YAAC;AAAD,CAAC,AAzCD,IAyCC"}

package/ranking/model/Scope.ts

@@ -0,0 +1,60 @@
+/*
+Copyright 2016 Game Server Services, Inc. or its affiliates. All Rights
+Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License").
+You may not use this file except in compliance with the License.
+A copy of the License is located at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+or in the "license" file accompanying this file. This file is distributed
+on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+express or implied. See the License for the specific language governing
+permissions and limitations under the License.
+ */
+
+import IModel from '../../core/interface/IModel';
+
+export default class Scope implements IModel {
+    private name: string|null = null;
+    private targetDays: number|null = null;
+    public getName(): string|null {
+        return this.name;
+    }
+    public setName(name: string|null) {
+        this.name = name;
+        return this;
+    }
+    public withName(name: string|null): this {
+        this.name = name;
+        return this;
+    }
+    public getTargetDays(): number|null {
+        return this.targetDays;
+    }
+    public setTargetDays(targetDays: number|null) {
+        this.targetDays = targetDays;
+        return this;
+    }
+    public withTargetDays(targetDays: number|null): this {
+        this.targetDays = targetDays;
+        return this;
+    }
+
+    public static fromDict(data: {[key: string]: any}): Scope|null {
+        if (data == undefined || data == null) {
+            return null;
+        }
+        return new Scope()
+            .withName(data["name"])
+            .withTargetDays(data["targetDays"]);
+    }
+
+    public toDict(): {[key: string]: any} {
+        return {
+            "name": this.getName(),
+            "targetDays": this.getTargetDays(),
+        };
+    }
+}

package/ranking/model/index.d.ts

@@ -4,9 +4,10 @@ import CategoryModelMaster from "./CategoryModelMaster";
 import Subscribe from "./Subscribe";
 import Score from "./Score";
 import Ranking from "./Ranking";
+import Scope from "./Scope";
 import CurrentRankingMaster from "./CurrentRankingMaster";
 import CalculatedAt from "./CalculatedAt";
 import SubscribeUser from "./SubscribeUser";
 import GitHubCheckoutSetting from "./GitHubCheckoutSetting";
 import LogSetting from "./LogSetting";
-export { Namespace, CategoryModel, CategoryModelMaster, Subscribe, Score, Ranking, CurrentRankingMaster, CalculatedAt, SubscribeUser, GitHubCheckoutSetting, LogSetting, };
+export { Namespace, CategoryModel, CategoryModelMaster, Subscribe, Score, Ranking, Scope, CurrentRankingMaster, CalculatedAt, SubscribeUser, GitHubCheckoutSetting, LogSetting, };

package/ranking/model/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogSetting = exports.GitHubCheckoutSetting = exports.SubscribeUser = exports.CalculatedAt = exports.CurrentRankingMaster = exports.Ranking = exports.Score = exports.Subscribe = exports.CategoryModelMaster = exports.CategoryModel = exports.Namespace = void 0;
+exports.LogSetting = exports.GitHubCheckoutSetting = exports.SubscribeUser = exports.CalculatedAt = exports.CurrentRankingMaster = exports.Scope = exports.Ranking = exports.Score = exports.Subscribe = exports.CategoryModelMaster = exports.CategoryModel = exports.Namespace = void 0;
 var tslib_1 = require("tslib");
 /*
 Copyright 2016 Game Server Services, Inc. or its affiliates. All Rights
@@ -29,6 +29,8 @@ var Score_1 = tslib_1.__importDefault(require("./Score"));
 exports.Score = Score_1.default;
 var Ranking_1 = tslib_1.__importDefault(require("./Ranking"));
 exports.Ranking = Ranking_1.default;
+var Scope_1 = tslib_1.__importDefault(require("./Scope"));
+exports.Scope = Scope_1.default;
 var CurrentRankingMaster_1 = tslib_1.__importDefault(require("./CurrentRankingMaster"));
 exports.CurrentRankingMaster = CurrentRankingMaster_1.default;
 var CalculatedAt_1 = tslib_1.__importDefault(require("./CalculatedAt"));

package/ranking/model/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,kEAAmC;AAa/B,oBAbG,mBAAS,CAaH;AAZb,0EAA2C;AAavC,wBAbG,uBAAa,CAaH;AAZjB,sFAAuD;AAanD,8BAbG,6BAAmB,CAaH;AAZvB,kEAAmC;AAa/B,oBAbG,mBAAS,CAaH;AAZb,0DAA2B;AAavB,gBAbG,eAAK,CAaH;AAZT,8DAA+B;AAa3B,kBAbG,iBAAO,CAaH;AAZX,wFAAyD;AAarD,+BAbG,8BAAoB,CAaH;AAZxB,wEAAyC;AAarC,uBAbG,sBAAY,CAaH;AAZhB,0EAA2C;AAavC,wBAbG,uBAAa,CAaH;AAZjB,0FAA2D;AAavD,gCAbG,+BAAqB,CAaH;AAZzB,oEAAqC;AAajC,qBAbG,oBAAU,CAaH"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,kEAAmC;AAc/B,oBAdG,mBAAS,CAcH;AAbb,0EAA2C;AAcvC,wBAdG,uBAAa,CAcH;AAbjB,sFAAuD;AAcnD,8BAdG,6BAAmB,CAcH;AAbvB,kEAAmC;AAc/B,oBAdG,mBAAS,CAcH;AAbb,0DAA2B;AAcvB,gBAdG,eAAK,CAcH;AAbT,8DAA+B;AAc3B,kBAdG,iBAAO,CAcH;AAbX,0DAA2B;AAcvB,gBAdG,eAAK,CAcH;AAbT,wFAAyD;AAcrD,+BAdG,8BAAoB,CAcH;AAbxB,wEAAyC;AAcrC,uBAdG,sBAAY,CAcH;AAbhB,0EAA2C;AAcvC,wBAdG,uBAAa,CAcH;AAbjB,0FAA2D;AAcvD,gCAdG,+BAAqB,CAcH;AAbzB,oEAAqC;AAcjC,qBAdG,oBAAU,CAcH"}

package/ranking/model/index.ts

@@ -19,6 +19,7 @@ import CategoryModelMaster from "./CategoryModelMaster"
 import Subscribe from "./Subscribe"
 import Score from "./Score"
 import Ranking from "./Ranking"
+import Scope from "./Scope"
 import CurrentRankingMaster from "./CurrentRankingMaster"
 import CalculatedAt from "./CalculatedAt"
 import SubscribeUser from "./SubscribeUser"
@@ -32,6 +33,7 @@ export {
     Subscribe,
     Score,
     Ranking,
+    Scope,
     CurrentRankingMaster,
     CalculatedAt,
     SubscribeUser,

package/ranking/request/CalcRankingRequest.d.ts

@@ -4,6 +4,7 @@ export default class CalcRankingRequest implements IRequest {
     private contextStack;
     private namespaceName;
     private categoryName;
+    private additionalScopeName;
     getRequestId(): string | null;
     setRequestId(requestId: string | null): this;
     withRequestId(requestId: string | null): this;
@@ -16,6 +17,9 @@ export default class CalcRankingRequest implements IRequest {
     getCategoryName(): string | null;
     setCategoryName(categoryName: string | null): this;
     withCategoryName(categoryName: string | null): this;
+    getAdditionalScopeName(): string | null;
+    setAdditionalScopeName(additionalScopeName: string | null): this;
+    withAdditionalScopeName(additionalScopeName: string | null): this;
     static fromDict(data: {
         [key: string]: any;
     }): CalcRankingRequest;

package/ranking/request/CalcRankingRequest.js

@@ -21,6 +21,7 @@ var CalcRankingRequest = /** @class */ (function () {
         this.contextStack = null;
         this.namespaceName = null;
         this.categoryName = null;
+        this.additionalScopeName = null;
     }
     CalcRankingRequest.prototype.getRequestId = function () {
         return this.requestId;
@@ -66,15 +67,28 @@ var CalcRankingRequest = /** @class */ (function () {
         this.categoryName = categoryName;
         return this;
     };
+    CalcRankingRequest.prototype.getAdditionalScopeName = function () {
+        return this.additionalScopeName;
+    };
+    CalcRankingRequest.prototype.setAdditionalScopeName = function (additionalScopeName) {
+        this.additionalScopeName = additionalScopeName;
+        return this;
+    };
+    CalcRankingRequest.prototype.withAdditionalScopeName = function (additionalScopeName) {
+        this.additionalScopeName = additionalScopeName;
+        return this;
+    };
     CalcRankingRequest.fromDict = function (data) {
         return new CalcRankingRequest()
             .withNamespaceName(data["namespaceName"])
-            .withCategoryName(data["categoryName"]);
+            .withCategoryName(data["categoryName"])
+            .withAdditionalScopeName(data["additionalScopeName"]);
     };
     CalcRankingRequest.prototype.toDict = function () {
         return {
             "namespaceName": this.getNamespaceName(),
             "categoryName": this.getCategoryName(),
+            "additionalScopeName": this.getAdditionalScopeName(),
         };
     };
     return CalcRankingRequest;