gs2 1.3.107 → 1.3.113

package/watch/request/GetChartRequest.js

@@ -15,20 +15,22 @@ 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 Gs2Watch = tslib_1.__importStar(require("../model"));
 var GetChartRequest = /** @class */ (function () {
     function GetChartRequest() {
         this.requestId = null;
         this.contextStack = null;
-        this.metrics = null;
+        this.measure = null;
         this.grn = null;
-        this.queries = null;
-        this.by = null;
-        this.timeframe = null;
-        this.size = null;
-        this.format = null;
-        this.aggregator = null;
-        this.style = null;
-        this.title = null;
+        this.round = null;
+        this.filters = null;
+        this.groupBys = null;
+        this.countBy = null;
+        this.begin = null;
+        this.end = null;
+        this.pageToken = null;
+        this.limit = null;
     }
     GetChartRequest.prototype.getRequestId = function () {
         return this.requestId;
@@ -52,15 +54,15 @@ var GetChartRequest = /** @class */ (function () {
         this.contextStack = contextStack;
         return this;
     };
-    GetChartRequest.prototype.getMetrics = function () {
-        return this.metrics;
+    GetChartRequest.prototype.getMeasure = function () {
+        return this.measure;
     };
-    GetChartRequest.prototype.setMetrics = function (metrics) {
-        this.metrics = metrics;
+    GetChartRequest.prototype.setMeasure = function (measure) {
+        this.measure = measure;
         return this;
     };
-    GetChartRequest.prototype.withMetrics = function (metrics) {
-        this.metrics = metrics;
+    GetChartRequest.prototype.withMeasure = function (measure) {
+        this.measure = measure;
         return this;
     };
     GetChartRequest.prototype.getGrn = function () {
@@ -74,125 +76,131 @@ var GetChartRequest = /** @class */ (function () {
         this.grn = grn;
         return this;
     };
-    GetChartRequest.prototype.getQueries = function () {
-        return this.queries;
+    GetChartRequest.prototype.getRound = function () {
+        return this.round;
     };
-    GetChartRequest.prototype.setQueries = function (queries) {
-        this.queries = queries;
+    GetChartRequest.prototype.setRound = function (round) {
+        this.round = round;
         return this;
     };
-    GetChartRequest.prototype.withQueries = function (queries) {
-        this.queries = queries;
+    GetChartRequest.prototype.withRound = function (round) {
+        this.round = round;
         return this;
     };
-    GetChartRequest.prototype.getBy = function () {
-        return this.by;
+    GetChartRequest.prototype.getFilters = function () {
+        return this.filters;
     };
-    GetChartRequest.prototype.setBy = function (by) {
-        this.by = by;
+    GetChartRequest.prototype.setFilters = function (filters) {
+        this.filters = filters;
         return this;
     };
-    GetChartRequest.prototype.withBy = function (by) {
-        this.by = by;
+    GetChartRequest.prototype.withFilters = function (filters) {
+        this.filters = filters;
         return this;
     };
-    GetChartRequest.prototype.getTimeframe = function () {
-        return this.timeframe;
+    GetChartRequest.prototype.getGroupBys = function () {
+        return this.groupBys;
     };
-    GetChartRequest.prototype.setTimeframe = function (timeframe) {
-        this.timeframe = timeframe;
+    GetChartRequest.prototype.setGroupBys = function (groupBys) {
+        this.groupBys = groupBys;
         return this;
     };
-    GetChartRequest.prototype.withTimeframe = function (timeframe) {
-        this.timeframe = timeframe;
+    GetChartRequest.prototype.withGroupBys = function (groupBys) {
+        this.groupBys = groupBys;
         return this;
     };
-    GetChartRequest.prototype.getSize = function () {
-        return this.size;
+    GetChartRequest.prototype.getCountBy = function () {
+        return this.countBy;
     };
-    GetChartRequest.prototype.setSize = function (size) {
-        this.size = size;
+    GetChartRequest.prototype.setCountBy = function (countBy) {
+        this.countBy = countBy;
         return this;
     };
-    GetChartRequest.prototype.withSize = function (size) {
-        this.size = size;
+    GetChartRequest.prototype.withCountBy = function (countBy) {
+        this.countBy = countBy;
         return this;
     };
-    GetChartRequest.prototype.getFormat = function () {
-        return this.format;
+    GetChartRequest.prototype.getBegin = function () {
+        return this.begin;
     };
-    GetChartRequest.prototype.setFormat = function (format) {
-        this.format = format;
+    GetChartRequest.prototype.setBegin = function (begin) {
+        this.begin = begin;
         return this;
     };
-    GetChartRequest.prototype.withFormat = function (format) {
-        this.format = format;
+    GetChartRequest.prototype.withBegin = function (begin) {
+        this.begin = begin;
         return this;
     };
-    GetChartRequest.prototype.getAggregator = function () {
-        return this.aggregator;
+    GetChartRequest.prototype.getEnd = function () {
+        return this.end;
     };
-    GetChartRequest.prototype.setAggregator = function (aggregator) {
-        this.aggregator = aggregator;
+    GetChartRequest.prototype.setEnd = function (end) {
+        this.end = end;
         return this;
     };
-    GetChartRequest.prototype.withAggregator = function (aggregator) {
-        this.aggregator = aggregator;
+    GetChartRequest.prototype.withEnd = function (end) {
+        this.end = end;
         return this;
     };
-    GetChartRequest.prototype.getStyle = function () {
-        return this.style;
+    GetChartRequest.prototype.getPageToken = function () {
+        return this.pageToken;
     };
-    GetChartRequest.prototype.setStyle = function (style) {
-        this.style = style;
+    GetChartRequest.prototype.setPageToken = function (pageToken) {
+        this.pageToken = pageToken;
         return this;
     };
-    GetChartRequest.prototype.withStyle = function (style) {
-        this.style = style;
+    GetChartRequest.prototype.withPageToken = function (pageToken) {
+        this.pageToken = pageToken;
         return this;
     };
-    GetChartRequest.prototype.getTitle = function () {
-        return this.title;
+    GetChartRequest.prototype.getLimit = function () {
+        return this.limit;
     };
-    GetChartRequest.prototype.setTitle = function (title) {
-        this.title = title;
+    GetChartRequest.prototype.setLimit = function (limit) {
+        this.limit = limit;
         return this;
     };
-    GetChartRequest.prototype.withTitle = function (title) {
-        this.title = title;
+    GetChartRequest.prototype.withLimit = function (limit) {
+        this.limit = limit;
         return this;
     };
     GetChartRequest.fromDict = function (data) {
         return new GetChartRequest()
-            .withMetrics(data["metrics"])
+            .withMeasure(data["measure"])
             .withGrn(data["grn"])
-            .withQueries(data.queries ?
-            data.queries.map(function (item) {
+            .withRound(data["round"])
+            .withFilters(data.filters ?
+            data.filters.map(function (item) {
+                return Gs2Watch.Filter.fromDict(item);
+            }) : [])
+            .withGroupBys(data.groupBys ?
+            data.groupBys.map(function (item) {
                 return item;
             }) : [])
-            .withBy(data["by"])
-            .withTimeframe(data["timeframe"])
-            .withSize(data["size"])
-            .withFormat(data["format"])
-            .withAggregator(data["aggregator"])
-            .withStyle(data["style"])
-            .withTitle(data["title"]);
+            .withCountBy(data["countBy"])
+            .withBegin(data["begin"])
+            .withEnd(data["end"])
+            .withPageToken(data["pageToken"])
+            .withLimit(data["limit"]);
     };
     GetChartRequest.prototype.toDict = function () {
         return {
-            "metrics": this.getMetrics(),
+            "measure": this.getMeasure(),
             "grn": this.getGrn(),
-            "queries": this.getQueries() ?
-                this.getQueries().map(function (item) {
+            "round": this.getRound(),
+            "filters": this.getFilters() ?
+                this.getFilters().map(function (item) {
+                    return item.toDict();
+                }) : [],
+            "groupBys": this.getGroupBys() ?
+                this.getGroupBys().map(function (item) {
                     return item;
                 }) : [],
-            "by": this.getBy(),
-            "timeframe": this.getTimeframe(),
-            "size": this.getSize(),
-            "format": this.getFormat(),
-            "aggregator": this.getAggregator(),
-            "style": this.getStyle(),
-            "title": this.getTitle(),
+            "countBy": this.getCountBy(),
+            "begin": this.getBegin(),
+            "end": this.getEnd(),
+            "pageToken": this.getPageToken(),
+            "limit": this.getLimit(),
         };
     };
     return GetChartRequest;

package/watch/request/GetChartRequest.js.map

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

package/watch/request/GetChartRequest.ts

@@ -22,16 +22,16 @@ export default class GetChartRequest implements IRequest {
 
     private requestId: string|null = null;
     private contextStack: string|null = null;
-    private metrics: string|null = null;
+    private measure: string|null = null;
     private grn: string|null = null;
-    private queries: string[]|null = null;
-    private by: string|null = null;
-    private timeframe: string|null = null;
-    private size: string|null = null;
-    private format: string|null = null;
-    private aggregator: string|null = null;
-    private style: string|null = null;
-    private title: string|null = null;
+    private round: string|null = null;
+    private filters: Gs2Watch.Filter[]|null = null;
+    private groupBys: string[]|null = null;
+    private countBy: string|null = null;
+    private begin: number|null = null;
+    private end: number|null = null;
+    private pageToken: string|null = null;
+    private limit: number|null = null;
 
     public getRequestId(): string|null {
         return this.requestId;
@@ -60,15 +60,15 @@ export default class GetChartRequest implements IRequest {
         this.contextStack = contextStack;
         return this;
     }
-    public getMetrics(): string|null {
-        return this.metrics;
+    public getMeasure(): string|null {
+        return this.measure;
     }
-    public setMetrics(metrics: string|null) {
-        this.metrics = metrics;
+    public setMeasure(measure: string|null) {
+        this.measure = measure;
         return this;
     }
-    public withMetrics(metrics: string|null): this {
-        this.metrics = metrics;
+    public withMeasure(measure: string|null): this {
+        this.measure = measure;
         return this;
     }
     public getGrn(): string|null {
@@ -82,129 +82,137 @@ export default class GetChartRequest implements IRequest {
         this.grn = grn;
         return this;
     }
-    public getQueries(): string[]|null {
-        return this.queries;
+    public getRound(): string|null {
+        return this.round;
     }
-    public setQueries(queries: string[]|null) {
-        this.queries = queries;
+    public setRound(round: string|null) {
+        this.round = round;
         return this;
     }
-    public withQueries(queries: string[]|null): this {
-        this.queries = queries;
+    public withRound(round: string|null): this {
+        this.round = round;
         return this;
     }
-    public getBy(): string|null {
-        return this.by;
+    public getFilters(): Gs2Watch.Filter[]|null {
+        return this.filters;
     }
-    public setBy(by: string|null) {
-        this.by = by;
+    public setFilters(filters: Gs2Watch.Filter[]|null) {
+        this.filters = filters;
         return this;
     }
-    public withBy(by: string|null): this {
-        this.by = by;
+    public withFilters(filters: Gs2Watch.Filter[]|null): this {
+        this.filters = filters;
         return this;
     }
-    public getTimeframe(): string|null {
-        return this.timeframe;
+    public getGroupBys(): string[]|null {
+        return this.groupBys;
     }
-    public setTimeframe(timeframe: string|null) {
-        this.timeframe = timeframe;
+    public setGroupBys(groupBys: string[]|null) {
+        this.groupBys = groupBys;
         return this;
     }
-    public withTimeframe(timeframe: string|null): this {
-        this.timeframe = timeframe;
+    public withGroupBys(groupBys: string[]|null): this {
+        this.groupBys = groupBys;
         return this;
     }
-    public getSize(): string|null {
-        return this.size;
+    public getCountBy(): string|null {
+        return this.countBy;
     }
-    public setSize(size: string|null) {
-        this.size = size;
+    public setCountBy(countBy: string|null) {
+        this.countBy = countBy;
         return this;
     }
-    public withSize(size: string|null): this {
-        this.size = size;
+    public withCountBy(countBy: string|null): this {
+        this.countBy = countBy;
         return this;
     }
-    public getFormat(): string|null {
-        return this.format;
+    public getBegin(): number|null {
+        return this.begin;
     }
-    public setFormat(format: string|null) {
-        this.format = format;
+    public setBegin(begin: number|null) {
+        this.begin = begin;
         return this;
     }
-    public withFormat(format: string|null): this {
-        this.format = format;
+    public withBegin(begin: number|null): this {
+        this.begin = begin;
         return this;
     }
-    public getAggregator(): string|null {
-        return this.aggregator;
+    public getEnd(): number|null {
+        return this.end;
     }
-    public setAggregator(aggregator: string|null) {
-        this.aggregator = aggregator;
+    public setEnd(end: number|null) {
+        this.end = end;
         return this;
     }
-    public withAggregator(aggregator: string|null): this {
-        this.aggregator = aggregator;
+    public withEnd(end: number|null): this {
+        this.end = end;
         return this;
     }
-    public getStyle(): string|null {
-        return this.style;
+    public getPageToken(): string|null {
+        return this.pageToken;
     }
-    public setStyle(style: string|null) {
-        this.style = style;
+    public setPageToken(pageToken: string|null) {
+        this.pageToken = pageToken;
         return this;
     }
-    public withStyle(style: string|null): this {
-        this.style = style;
+    public withPageToken(pageToken: string|null): this {
+        this.pageToken = pageToken;
         return this;
     }
-    public getTitle(): string|null {
-        return this.title;
+    public getLimit(): number|null {
+        return this.limit;
     }
-    public setTitle(title: string|null) {
-        this.title = title;
+    public setLimit(limit: number|null) {
+        this.limit = limit;
         return this;
     }
-    public withTitle(title: string|null): this {
-        this.title = title;
+    public withLimit(limit: number|null): this {
+        this.limit = limit;
         return this;
     }
 
     public static fromDict(data: {[key: string]: any}): GetChartRequest {
         return new GetChartRequest()
-            .withMetrics(data["metrics"])
+            .withMeasure(data["measure"])
             .withGrn(data["grn"])
-            .withQueries(data.queries ?
-                data.queries.map((item: {[key: string]: any}) => {
+            .withRound(data["round"])
+            .withFilters(data.filters ?
+                data.filters.map((item: {[key: string]: any}) => {
+                    return Gs2Watch.Filter.fromDict(item);
+                }
+            ) : [])
+            .withGroupBys(data.groupBys ?
+                data.groupBys.map((item: {[key: string]: any}) => {
                     return item;
                 }
             ) : [])
-            .withBy(data["by"])
-            .withTimeframe(data["timeframe"])
-            .withSize(data["size"])
-            .withFormat(data["format"])
-            .withAggregator(data["aggregator"])
-            .withStyle(data["style"])
-            .withTitle(data["title"]);
+            .withCountBy(data["countBy"])
+            .withBegin(data["begin"])
+            .withEnd(data["end"])
+            .withPageToken(data["pageToken"])
+            .withLimit(data["limit"]);
     }
 
     public toDict(): {[key: string]: any} {
         return {
-            "metrics": this.getMetrics(),
+            "measure": this.getMeasure(),
             "grn": this.getGrn(),
-            "queries": this.getQueries() ?
-                this.getQueries()!.map((item: string) => {
+            "round": this.getRound(),
+            "filters": this.getFilters() ?
+                this.getFilters()!.map((item: Gs2Watch.Filter) => {
+                    return item.toDict();
+                }
+            ) : [],
+            "groupBys": this.getGroupBys() ?
+                this.getGroupBys()!.map((item: string) => {
                     return item;
                 }
             ) : [],
-            "by": this.getBy(),
-            "timeframe": this.getTimeframe(),
-            "size": this.getSize(),
-            "format": this.getFormat(),
-            "aggregator": this.getAggregator(),
-            "style": this.getStyle(),
-            "title": this.getTitle(),
+            "countBy": this.getCountBy(),
+            "begin": this.getBegin(),
+            "end": this.getEnd(),
+            "pageToken": this.getPageToken(),
+            "limit": this.getLimit(),
         };
     }
 }

package/watch/request/GetDistributionRequest.d.ts

@@ -0,0 +1,50 @@
+import IRequest from '../../core/interface/IRequest';
+import * as Gs2Watch from '../model';
+export default class GetDistributionRequest implements IRequest {
+    private requestId;
+    private contextStack;
+    private measure;
+    private grn;
+    private filters;
+    private groupBys;
+    private begin;
+    private end;
+    private pageToken;
+    private limit;
+    getRequestId(): string | null;
+    setRequestId(requestId: string | null): this;
+    withRequestId(requestId: string | null): this;
+    getContextStack(): string | null;
+    setContextStack(contextStack: string | null): this;
+    withContextStack(contextStack: string | null): this;
+    getMeasure(): string | null;
+    setMeasure(measure: string | null): this;
+    withMeasure(measure: string | null): this;
+    getGrn(): string | null;
+    setGrn(grn: string | null): this;
+    withGrn(grn: string | null): this;
+    getFilters(): Gs2Watch.Filter[] | null;
+    setFilters(filters: Gs2Watch.Filter[] | null): this;
+    withFilters(filters: Gs2Watch.Filter[] | null): this;
+    getGroupBys(): string[] | null;
+    setGroupBys(groupBys: string[] | null): this;
+    withGroupBys(groupBys: string[] | null): this;
+    getBegin(): number | null;
+    setBegin(begin: number | null): this;
+    withBegin(begin: number | null): this;
+    getEnd(): number | null;
+    setEnd(end: number | null): this;
+    withEnd(end: number | null): this;
+    getPageToken(): string | null;
+    setPageToken(pageToken: string | null): this;
+    withPageToken(pageToken: string | null): this;
+    getLimit(): number | null;
+    setLimit(limit: number | null): this;
+    withLimit(limit: number | null): this;
+    static fromDict(data: {
+        [key: string]: any;
+    }): GetDistributionRequest;
+    toDict(): {
+        [key: string]: any;
+    };
+}